RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 00:32:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'

Browse Source 
* commit '650d384048ed42579cc6d67bf32a94b468c0b6cb':
  yuv4mpegenc: do not access AVCodecContext.coded_frame

Conflicts:
	libavformat/yuv4mpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-09 23:34:33 +02:00
commit f233666880
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/yuv4mpegenc.c
View File

@ -48,15 +48,12 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf)
if (aspectn == 0 && aspectd == 1) if (aspectn == 0 && aspectd == 1)
aspectd = 0; // 0:0 means unknown aspectd = 0; // 0:0 means unknown
inter = 'p'; /* progressive is the default */ switch (st->codec->field_order) {
if (st->codec->coded_frame && st->codec->coded_frame->interlaced_frame) case AV_FIELD_TB:
inter = st->codec->coded_frame->top_field_first ? 't' : 'b'; case AV_FIELD_TT: inter = 't'; break;
if (st->codec->field_order == AV_FIELD_PROGRESSIVE) { case AV_FIELD_BT:
inter = 'p'; case AV_FIELD_BB: inter = 'b'; break;
} else if (st->codec->field_order == AV_FIELD_TB || st->codec->field_order == AV_FIELD_TT) { default: inter = 'p'; break;
inter = 't';
} else if (st->codec->field_order == AV_FIELD_BT || st->codec->field_order == AV_FIELD_BB) {
inter = 'b';
} }
switch (st->codec->pix_fmt) { switch (st->codec->pix_fmt) {