[FFmpeg-cvslog] Revert "Merge commit '187d719760bd130f848194ec4a6bd476341914bb'"

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Jul  9 15:54:59 2016 +0200| [3cdd5f4b7c02820b2e236003b9173cd2fa5184b9] | committer: Clément Bœsch

Revert "Merge commit '187d719760bd130f848194ec4a6bd476341914bb'"

This reverts commit c67aa7f287e791b2c02c0c6471336c8adc88020e, reversing
changes made to 46bd0e8e0dfb4b295e8fbe6854904eccb0cb5c82.

The merge should have been a noop as the support was added in
601c2388549ff395bc99383029e92c2219152af0

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

 libavcodec/h264.c |   13 -------------
 1 file changed, 13 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index b4eae37..8eb3b13 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1235,8 +1235,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 +1302,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;