diff options
| author | Clément Bœsch <[email protected]> | 2016-06-29 15:17:16 +0200 |
|---|---|---|
| committer | Clément Bœsch <[email protected]> | 2016-06-29 15:17:16 +0200 |
| commit | 527a57932765f493529449f13d0d79ee5c7116e1 (patch) | |
| tree | 24b8ac0e0708d756c12d0167709cc41a003ea1fc /libavcodec/h264_slice.c | |
| parent | d7a2451688442d2736f4811267277c7051f414a6 (diff) | |
| parent | 7b50d60442af8d9527e9da46818011fe15a5265a (diff) | |
Merge commit '7b50d60442af8d9527e9da46818011fe15a5265a'
* commit '7b50d60442af8d9527e9da46818011fe15a5265a':
h264: call ff_h264_fill_mbaff_ref_list() when constructing the normal ref list
Merged-by: Clément Bœsch <[email protected]>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 497a99cdca..666d99f837 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1629,8 +1629,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) } if (FRAME_MBAFF(h)) { - ff_h264_fill_mbaff_ref_list(sl); - if (pps->weighted_bipred_idc == 2 && sl->slice_type_nos == AV_PICTURE_TYPE_B) { implicit_weight_table(h, sl, 0); implicit_weight_table(h, sl, 1); |