diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 18:31:44 +0300 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 18:32:05 +0300 |
| commit | 2aff557c6acbce2b2b604c6c620c66c892260062 (patch) | |
| tree | 700012d0c51c5363e67fb7511a5258ba138ce73d /libavcodec/h264_slice.c | |
| parent | 89cccfc905f7fdd94a9c2c099f01790441f71ce0 (diff) | |
| parent | ed9a20ebe4a89de119ea97bdccf688ece8c6648c (diff) | |
Merge commit 'ed9a20ebe4a89de119ea97bdccf688ece8c6648c' into merge-libav-new
* commit 'ed9a20ebe4a89de119ea97bdccf688ece8c6648c':
h264: split reading the ref list modifications and actually building the ref list
ref_modifications.val are read as u32 instead of u8 in FFmpeg.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 0c36c8f925..5cfb34fd54 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1597,6 +1597,9 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) sl->ref_count[1] = sl->ref_count[0] = 0; return ret; } + ret = ff_h264_build_ref_list(h, sl); + if (ret < 0) + return ret; } if ((pps->weighted_pred && sl->slice_type_nos == AV_PICTURE_TYPE_P) || |