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

[ffmpeg] / libavcodec / h264.c

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index b4eae374ce931f82d8322db66828b033931a9ac6..db68c0572222f293adc5aa805c90527ae285d2a6 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -776,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,7 +949,7 @@ again:
         case NAL_SLICE:
             sl->gb = nal->gb;
 
-            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) {
@@ -1235,8 +1233,6 @@ static int h264_decode_frame(AVCodecContext *avctx, void *data,
     H264Picture *out;
     int i, out_idx;
     int ret;
-    const uint8_t *new_extradata;
-    int new_extradata_size;
 
     h->flags = avctx->flags;
     h->setup_finished = 0;
@@ -1304,17 +1300,6 @@ static int h264_decode_frame(AVCodecContext *avctx, void *data,
                                             avctx->err_recognition, avctx);
     }
 
-    new_extradata_size = 0;
-    new_extradata = av_packet_get_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA,
-                                            &new_extradata_size);
-    if (new_extradata_size > 0 && new_extradata) {
-        ret = ff_h264_decode_extradata(new_extradata, new_extradata_size,
-                                       &h->ps, &h->is_avc, &h->nal_length_size,
-                                       avctx->err_recognition, avctx);
-        if (ret < 0)
-            return ret;
-    }
-
     buf_index = decode_nal_units(h, buf, buf_size);
     if (buf_index < 0)
         return AVERROR_INVALIDDATA;