[FFmpeg-cvslog] r22553 - trunk/ffmpeg.c

[michael]

Author: michael
Date: Mon Mar 15 20:45:57 2010
New Revision: 22553

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

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Mon Mar 15 20:23:24 2010	(r22552)
+++ trunk/ffmpeg.c	Mon Mar 15 20:45:57 2010	(r22553)
@@ -3147,7 +3147,11 @@ static void new_video_stream(AVFormatCon
                 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];
         }