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

Simplify tff setting code in MPV_frame_start().

Originally committed as revision 26090 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 58ec7e00
......@@ -964,13 +964,11 @@ int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
s->current_picture_ptr= pic;
//FIXME use only the vars from current_pic
s->current_picture_ptr->top_field_first= s->top_field_first;
if(s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO) {
if(s->picture_structure == PICT_FRAME)
s->current_picture_ptr->top_field_first= s->top_field_first;
else
if(s->picture_structure != PICT_FRAME)
s->current_picture_ptr->top_field_first= (s->picture_structure == PICT_TOP_FIELD) == s->first_field;
} else
s->current_picture_ptr->top_field_first= s->top_field_first;
}
s->current_picture_ptr->interlaced_frame= !s->progressive_frame && !s->progressive_sequence;
}
......
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