From c39059bea3adebcd888571d1181db215eee54495 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 18 Jul 2014 01:49:54 +0200 Subject: 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 Signed-off-by: Vittorio Giovara --- libavcodec/h264_direct.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec/h264_direct.c') diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 0cf0d46022..f98389868d 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; -- cgit v1.2.3