[SCM] libav/experimental: Simplify tff setting code in MPV_frame_start().

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 52654005caa343e9d17c0776d05825f1d771f448
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Dec 25 19:49:19 2010 +0000

    Simplify tff setting code in MPV_frame_start().
    
    Originally committed as revision 26090 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 9650066..65221f3 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -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;
     }
 

-- 
Libav/FFmpeg packaging