diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-29 14:31:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-29 14:49:15 +0200 |
| commit | e6e8750e943215535b35820cbe1533696512b613 (patch) | |
| tree | 3d5de93d3665675054cbf5223402ecaf1fa14a1f | |
| parent | 1eb43af1a0e542ad83dcbf327197785d815fc42d (diff) | |
| download | ffmpeg-e6e8750e943215535b35820cbe1533696512b613.tar.gz | |
avcodec/h264: Remove current_sps_id
This should not be needed anymore and simplifies the next merge
Requested-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/h264.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264.h | 2 | ||||
| -rw-r--r-- | libavcodec/h264_slice.c | 5 |
3 files changed, 1 insertions, 7 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index a61379cc9f..935f2d038a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -308,7 +308,6 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h) h->backup_width = -1; h->backup_height = -1; h->backup_pix_fmt = AV_PIX_FMT_NONE; - h->current_sps_id = -1; h->cur_chroma_format_idc = -1; h->picture_structure = PICT_FRAME; diff --git a/libavcodec/h264.h b/libavcodec/h264.h index f91e5be518..cb24e33dd8 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -516,8 +516,6 @@ typedef struct H264Context { int b_stride; // FIXME use s->b4_stride - unsigned current_sps_id; ///< id of the current SPS - int au_pps_id; ///< pps_id of current access unit uint16_t *slice_table; ///< slice_table_base + 2*mb_stride + 1 diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 474400ba2f..16595e00e6 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1171,9 +1171,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) } } - if (h->ps.sps != (const SPS*)h->ps.sps_list[h->ps.pps->sps_id]->data || - pps->sps_id != h->current_sps_id) { - + if (h->ps.sps != (const SPS*)h->ps.sps_list[h->ps.pps->sps_id]->data) { if (!first_slice) { av_log(h->avctx, AV_LOG_ERROR, "SPS changed in the middle of the frame\n"); @@ -1783,7 +1781,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) } h->au_pps_id = pps_id; - h->current_sps_id = h->ps.pps->sps_id; if (h->avctx->debug & FF_DEBUG_PICT_INFO) { av_log(h->avctx, AV_LOG_DEBUG, |