lavc/Makefile: Fix standalone compilation of the svq3 decoder.

[ffmpeg] / libavcodec / h264.c

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index a61379cc9fa7df7b9b669284b48b62bf5b6762e9..db68c0572222f293adc5aa805c90527ae285d2a6 100644 (file)
--- 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;
@@ -777,8 +776,6 @@ void ff_h264_flush_change(H264Context *h)
     h->frame_recovered = 0;
     h->current_slice = 0;
     h->mmco_reset = 1;
-    for (i = 0; i < h->nb_slice_ctx; i++)
-        h->slice_ctx[i].list_count = 0;
 }
 
 /* forget old pics after a seek */
@@ -951,11 +948,8 @@ again:
             h->has_recovery_point = 1;
         case NAL_SLICE:
             sl->gb = nal->gb;
-            if (   nals_needed >= i
-                || (!(avctx->active_thread_type & FF_THREAD_FRAME) && !context_count))
-                h->au_pps_id = -1;
 
-            if ((err = ff_h264_decode_slice_header(h, sl)))
+            if ((err = ff_h264_decode_slice_header(h, sl, nal)))
                 break;
 
             if (h->sei.recovery_point.recovery_frame_cnt >= 0) {