[FFmpeg-cvslog] avcodec/h264: Remove current_sps_id

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Jun 29 14:31:04 2016 +0200| [e6e8750e943215535b35820cbe1533696512b613] | committer: Michael Niedermayer

avcodec/h264: Remove current_sps_id

This should not be needed anymore and simplifies the next merge

Requested-by: Clément Bœsch <u at pkh.me>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6e8750e943215535b35820cbe1533696512b613
---

 libavcodec/h264.c       |    1 -
 libavcodec/h264.h       |    2 --
 libavcodec/h264_slice.c |    5 +----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index a61379c..935f2d0 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 f91e5be..cb24e33 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 474400b..16595e0 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,