Allow mpeg style yuv in jpeg when strict standard compliance is small enough.
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Mar 2010 19:45:57 +0000 (19:45 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Mar 2010 19:45:57 +0000 (19:45 +0000)
Originally committed as revision 22553 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffmpeg.c

index 3bc751c..61b8332 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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];
         }