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_parse.h | |
parent | 6b295bccbbf7e19d92fe7850de42885b40fe9f07 (diff) | |
parent | a6e27f7add2698fdd89911632b570c3d0c3f2aaa (diff) | |
download | ffmpeg-278dcec28db8f309cf202b002966f06b9d275248.tar.gz |
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_parse.h')
-rw-r--r-- | libavcodec/h264_parse.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/h264_parse.h b/libavcodec/h264_parse.h index 8329351c20..0fac629ea3 100644 --- a/libavcodec/h264_parse.h +++ b/libavcodec/h264_parse.h @@ -40,6 +40,7 @@ typedef struct H264PredWeightTable { } H264PredWeightTable; struct SPS; +struct PPS; int ff_h264_pred_weight_table(GetBitContext *gb, const struct SPS *sps, const int *ref_count, int slice_type_nos, @@ -60,4 +61,8 @@ int ff_h264_check_intra_pred_mode(void *logctx, int top_samples_available, int left_samples_available, int mode, int is_chroma); +int ff_h264_parse_ref_count(int *plist_count, int ref_count[2], + GetBitContext *gb, const struct PPS *pps, + int slice_type_nos, int picture_structure, void *logctx); + #endif /* AVCODEC_H264_PARSE_H */ |