Mercurial > libavcodec.hg
comparison mpegvideo_enc.c @ 10669:aa4c90d19a59 libavcodec
10l, Fix YUV ljpeg that i just broke by mistake.
author | michael |
---|---|
date | Thu, 10 Dec 2009 19:41:47 +0000 |
parents | 6cebfebeb18f |
children | 7986ecc952e1 |
comparison
equal
deleted
inserted
replaced
10668:6eefb31b1bfc | 10669:aa4c90d19a59 |
---|---|
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){ | 534 if(avctx->codec->id == CODEC_ID_MJPEG || avctx->pix_fmt != PIX_FMT_BGRA){ |
535 s->mjpeg_vsample[0] = 2; | 535 s->mjpeg_vsample[0] = 2; |
536 s->mjpeg_vsample[1] = 2>>chroma_v_shift; | 536 s->mjpeg_vsample[1] = 2>>chroma_v_shift; |
537 s->mjpeg_vsample[2] = 2>>chroma_v_shift; | 537 s->mjpeg_vsample[2] = 2>>chroma_v_shift; |
538 s->mjpeg_hsample[0] = 2; | 538 s->mjpeg_hsample[0] = 2; |
539 s->mjpeg_hsample[1] = 2>>chroma_h_shift; | 539 s->mjpeg_hsample[1] = 2>>chroma_h_shift; |