diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-17 15:16:38 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-17 15:16:38 +0100 |
| commit | 278dcec28db8f309cf202b002966f06b9d275248 (patch) | |
| tree | 6858d93582c3bb46ce358961165ae4628b312bf6 /libavcodec/h264_slice.c | |
| parent | 6b295bccbbf7e19d92fe7850de42885b40fe9f07 (diff) | |
| parent | a6e27f7add2698fdd89911632b570c3d0c3f2aaa (diff) | |
Merge commit 'a6e27f7add2698fdd89911632b570c3d0c3f2aaa'
* commit 'a6e27f7add2698fdd89911632b570c3d0c3f2aaa':
h264: factor out parsing the reference count into a separate file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 0fcb5631b2..6f9a0416bd 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1692,7 +1692,9 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) if (sl->slice_type_nos == AV_PICTURE_TYPE_B) sl->direct_spatial_mv_pred = get_bits1(&sl->gb); - ret = ff_set_ref_count(h, sl); + ret = ff_h264_parse_ref_count(&sl->list_count, sl->ref_count, + &sl->gb, &h->pps, sl->slice_type_nos, + h->picture_structure, h->avctx); if (ret < 0) return ret; |