Mercurial > libavcodec.hg

comparison mpegvideo_enc.c @ 10670:7986ecc952e1 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic (restructure RGB ljpeg check to be more readable)
author michael
date Thu, 10 Dec 2009 20:05:04 +0000
parents aa4c90d19a59
children e5fac8ac71f6
comparison
equal deleted inserted replaced
10669:aa4c90d19a59 10670:7986ecc952e1
529 break; 529 break;
530 case CODEC_ID_LJPEG: 530 case CODEC_ID_LJPEG:
531 case CODEC_ID_MJPEG: 531 case CODEC_ID_MJPEG:
532 s->out_format = FMT_MJPEG; 532 s->out_format = FMT_MJPEG;
533 s->intra_only = 1; /* force intra only for jpeg */ 533 s->intra_only = 1; /* force intra only for jpeg */
534 if(avctx->codec->id == CODEC_ID_MJPEG || avctx->pix_fmt != PIX_FMT_BGRA){ 534 if(avctx->codec->id == CODEC_ID_LJPEG && avctx->pix_fmt == PIX_FMT_BGRA){
535 s->mjpeg_vsample[0] = 2;
536 s->mjpeg_vsample[1] = 2>>chroma_v_shift;
537 s->mjpeg_vsample[2] = 2>>chroma_v_shift;
538 s->mjpeg_hsample[0] = 2;
539 s->mjpeg_hsample[1] = 2>>chroma_h_shift;
540 s->mjpeg_hsample[2] = 2>>chroma_h_shift;
541 }else{
542 s->mjpeg_vsample[0] = s->mjpeg_hsample[0] = 535 s->mjpeg_vsample[0] = s->mjpeg_hsample[0] =
543 s->mjpeg_vsample[1] = s->mjpeg_hsample[1] = 536 s->mjpeg_vsample[1] = s->mjpeg_hsample[1] =
544 s->mjpeg_vsample[2] = s->mjpeg_hsample[2] = 1; 537 s->mjpeg_vsample[2] = s->mjpeg_hsample[2] = 1;
538 }else{
539 s->mjpeg_vsample[0] = 2;
540 s->mjpeg_vsample[1] = 2>>chroma_v_shift;
541 s->mjpeg_vsample[2] = 2>>chroma_v_shift;
542 s->mjpeg_hsample[0] = 2;
543 s->mjpeg_hsample[1] = 2>>chroma_h_shift;
544 s->mjpeg_hsample[2] = 2>>chroma_h_shift;
545 } 545 }
546 if (!(CONFIG_MJPEG_ENCODER || CONFIG_LJPEG_ENCODER) 546 if (!(CONFIG_MJPEG_ENCODER || CONFIG_LJPEG_ENCODER)
547 || ff_mjpeg_encode_init(s) < 0) 547 || ff_mjpeg_encode_init(s) < 0)
548 return -1; 548 return -1;
549 avctx->delay=0; 549 avctx->delay=0;