avcodec/h264: Remove current_sps_id
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 29 Jun 2016 12:31:04 +0000 (14:31 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 29 Jun 2016 12:49:15 +0000 (14:49 +0200)
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>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c

index a61379c..935f2d0 100644 (file)
@@ -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;
index f91e5be..cb24e33 100644 (file)
@@ -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
index 474400b..16595e0 100644 (file)
@@ -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,