diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:13 +0100 |
| commit | 56febc993b928ccc039a32158ca60b234c311875 (patch) | |
| tree | cf903dfec7dc8d31049ad427fb9265363e1b1988 /libavcodec/h264_parser.c | |
| parent | 5f390eef8ee2b8adab00c5d2923a52aa261eb999 (diff) | |
h264: move the slice type variables into the per-slice context
Diffstat (limited to 'libavcodec/h264_parser.c')
| -rw-r--r-- | libavcodec/h264_parser.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 672411e7b8..f5dcc52b8f 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -104,15 +104,15 @@ static int scan_mmco_reset(AVCodecParserContext *s) H264Context *h = &p->h; H264SliceContext *sl = &h->slice_ctx[0]; - h->slice_type_nos = s->pict_type & 3; + sl->slice_type_nos = s->pict_type & 3; if (h->pps.redundant_pic_cnt_present) get_ue_golomb(&h->gb); // redundant_pic_count - if (ff_set_ref_count(h) < 0) + if (ff_set_ref_count(h, sl) < 0) return AVERROR_INVALIDDATA; - if (h->slice_type_nos != AV_PICTURE_TYPE_I) { + if (sl->slice_type_nos != AV_PICTURE_TYPE_I) { int list; for (list = 0; list < h->list_count; list++) { if (get_bits1(&h->gb)) { @@ -140,8 +140,8 @@ static int scan_mmco_reset(AVCodecParserContext *s) } } - if ((h->pps.weighted_pred && h->slice_type_nos == AV_PICTURE_TYPE_P) || - (h->pps.weighted_bipred_idc == 1 && h->slice_type_nos == AV_PICTURE_TYPE_B)) + 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); if (get_bits1(&h->gb)) { // adaptive_ref_pic_marking_mode_flag |