virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-16 22:42:38 +02:00
Code Issues Releases Activity

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

Browse Source 
Originally committed as revision 22553 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2010-03-15 19:45:57 +00:00
parent 2fad097788
commit 802323508c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ffmpeg.c
View File

@ -3147,7 +3147,11 @@ static void new_video_stream(AVFormatContext *oc)
if(*p == video_enc->pix_fmt) if(*p == video_enc->pix_fmt)
break; 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]; video_enc->pix_fmt = codec->pix_fmts[0];
} }