[SCM] libav/experimental: Pass field order flag to libx264

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit b09f5482854f9b4a139b1401d196b26db11dd10f
Author: Marco Gittler <marco at gitma.de>
Date:   Tue Jan 25 18:07:34 2011 -0800

    Pass field order flag to libx264
    
    Signed-off-by: Jason Garrett-Glaser <jason at x264.com>

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 0dad5cd..85ef38c 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -105,6 +105,10 @@ static int X264_frame(AVCodecContext *ctx, uint8_t *buf,
             frame->pict_type == FF_P_TYPE ? X264_TYPE_P :
             frame->pict_type == FF_B_TYPE ? X264_TYPE_B :
                                             X264_TYPE_AUTO;
+        if (x4->params.b_tff != frame->top_field_first) {
+            x4->params.b_tff = frame->top_field_first;
+            x264_encoder_reconfig(x4->enc, &x4->params);
+        }
     }
 
     do {

-- 
Libav/FFmpeg packaging