Commit 80232350 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Allow mpeg style yuv in jpeg when strict standard compliance is small enough.

Originally committed as revision 22553 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2fad0977
......@@ -3147,7 +3147,11 @@ static void new_video_stream(AVFormatContext *oc)
if(*p == video_enc->pix_fmt)
break;
}
if(*p == -1)
if(*p == -1
&& !( video_enc->codec_id==CODEC_ID_MJPEG
&& video_enc->strict_std_compliance <= FF_COMPLIANCE_INOFFICIAL
&& ( video_enc->pix_fmt == PIX_FMT_YUV420P
|| video_enc->pix_fmt == PIX_FMT_YUV422P)))
video_enc->pix_fmt = codec->pix_fmts[0];
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment