diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 02:14:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 02:16:13 +0200 |
| commit | dc021a0218e1d02637ba414c2910a7268587dec4 (patch) | |
| tree | 9650b0f014b9e1f03aa302741f3a4eb80844a183 /libavcodec/h264_direct.c | |
| parent | 08b597b1f8f2a30b1a5d5a3ce62c926a6f130af5 (diff) | |
| parent | c39059bea3adebcd888571d1181db215eee54495 (diff) | |
| download | ffmpeg-dc021a0218e1d02637ba414c2910a7268587dec4.tar.gz | |
Merge commit 'c39059bea3adebcd888571d1181db215eee54495'
* commit 'c39059bea3adebcd888571d1181db215eee54495':
h264: Fix direct temporal mvs for bottom-field-first poc order
Conflicts:
libavcodec/h264_direct.c
See: ebd1c505d22ad96e044880755ed9f4cf7cab4f78
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_direct.c')
| -rw-r--r-- | libavcodec/h264_direct.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 4230a1387a..3289fe4700 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -49,9 +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->picture_structure == PICT_FRAME ? - h->cur_pic_ptr->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; |