diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2009-12-10 19:41:47 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2009-12-10 19:41:47 +0000 |
| commit | 401e0a74bdbd40b02508f593120228c4da886cd2 (patch) | |
| tree | 5adb5e7b15fce5427079607fcb2ba392bac65af3 /libavcodec | |
| parent | ca78dc3cccc92508e640552f31f99213cacc2786 (diff) | |
| download | ffmpeg-streaming-401e0a74bdbd40b02508f593120228c4da886cd2.zip ffmpeg-streaming-401e0a74bdbd40b02508f593120228c4da886cd2.tar.gz | |
10l, Fix YUV ljpeg that i just broke by mistake.
Originally committed as revision 20792 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index e6220c3..224ccff 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -531,7 +531,7 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) case CODEC_ID_MJPEG: s->out_format = FMT_MJPEG; s->intra_only = 1; /* force intra only for jpeg */ - if(avctx->codec->id == CODEC_ID_MJPEG){ + if(avctx->codec->id == CODEC_ID_MJPEG || avctx->pix_fmt != PIX_FMT_BGRA){ s->mjpeg_vsample[0] = 2; s->mjpeg_vsample[1] = 2>>chroma_v_shift; s->mjpeg_vsample[2] = 2>>chroma_v_shift; |
