From 370ddc7b38d6b27b54fc2f5ee5f3dd9506f8c7c8 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 11 Apr 2016 16:32:02 +0200 Subject: h264: remove H264Context.pict_type It is not used for anything internally, just exported in the output frames. So remove the indirection and set it directly in frame_start(). --- libavcodec/h264_slice.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libavcodec/h264_slice.c') diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index ee4b74a25e..9e08c0b64e 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -467,6 +467,8 @@ static int h264_frame_start(H264Context *h) pic->mmco_reset = 0; pic->recovered = 0; + pic->f->pict_type = h->slice_ctx[0].slice_type; + if (CONFIG_ERROR_RESILIENCE && h->enable_er) ff_er_frame_start(&h->slice_ctx[0].er); @@ -974,10 +976,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) return AVERROR_INVALIDDATA; } - // to make a few old functions happy, it's wrong though - if (!h->setup_finished) - h->pict_type = sl->slice_type; - pps_id = get_ue_golomb(&sl->gb); if (pps_id >= MAX_PPS_COUNT) { av_log(h->avctx, AV_LOG_ERROR, "pps_id %u out of range\n", pps_id); -- cgit v1.2.3