[SCM] libav/experimental: h264: Fix direct temporal mvs for bottom-field-first poc order

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c39059bea3adebcd888571d1181db215eee54495
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date:   Fri Jul 18 01:49:54 2014 +0200

    h264: Fix direct temporal mvs for bottom-field-first poc order
    
    Such files can be created using the --bff x264 option.
    
    Sample-Id: h264_direct_temporal_mvs_bff.mkv
    Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
    Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>

diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index 0cf0d46..f983898 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -49,7 +49,8 @@ static int get_scale_factor(H264Context *const h, int poc, int poc1, int i)
 
 void ff_h264_direct_dist_scale_factor(H264Context *const h)
 {
-    const int poc  = h->cur_pic_ptr->field_poc[h->picture_structure == PICT_BOTTOM_FIELD];
+    const int poc  = FIELD_PICTURE(h) ? h->cur_pic_ptr->field_poc[h->picture_structure == PICT_BOTTOM_FIELD]
+                                      : h->cur_pic_ptr->poc;
     const int poc1 = h->ref_list[1][0].poc;
     int i, field;
 

-- 
Libav/FFmpeg packaging