diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-26 15:04:29 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-26 15:04:29 +0100 |
| commit | ee38234c43b6b3280304be7a43dc569cef683c43 (patch) | |
| tree | d8988b87ec816f608ac38eb18a2d236220a3ac8a /libavcodec/h264_parser.c | |
| parent | 79aafd43fd255fc04e4f4db4c45d6d1f5a9b9fff (diff) | |
| parent | e481458bc308ee838deaeacac51929514762e7a7 (diff) | |
Merge commit 'e481458bc308ee838deaeacac51929514762e7a7'
* commit 'e481458bc308ee838deaeacac51929514762e7a7':
h264: factor out pred weight table parsing into a separate file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/h264_parser.c')
| -rw-r--r-- | libavcodec/h264_parser.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 9a06d61cf2..c86f0324f8 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -183,7 +183,8 @@ static int scan_mmco_reset(AVCodecParserContext *s) if ((h->pps.weighted_pred && sl->slice_type_nos == AV_PICTURE_TYPE_P) || (h->pps.weighted_bipred_idc == 1 && sl->slice_type_nos == AV_PICTURE_TYPE_B)) - ff_pred_weight_table(h, sl); + ff_h264_pred_weight_table(&sl->gb, &h->sps, sl->ref_count, sl->slice_type_nos, + &sl->pwt); if (get_bits1(&sl->gb)) { // adaptive_ref_pic_marking_mode_flag int i; |