diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2014-07-18 01:49:54 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-07-20 23:32:13 +0100 |
| commit | c39059bea3adebcd888571d1181db215eee54495 (patch) | |
| tree | fc219687c40c2f2e7efa6948f8d94c502c7a0a4b | |
| parent | b31d76e45fc3c6529dd7109e721676f3ec376d00 (diff) | |
| download | ffmpeg-c39059bea3adebcd888571d1181db215eee54495.tar.gz | |
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@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| -rw-r--r-- | libavcodec/h264_direct.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |