[FFmpeg-cvslog] h264: remove redundant parts of old slice in extradata code.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec 18 14:52:44 2012 +0100| [14f79ba18f263a746f91dbd80f4d109fb16105ca] | committer: Michael Niedermayer

h264: remove redundant parts of old slice in extradata code.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/h264.c |   11 +----------
 libavcodec/h264.h |    1 -
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index c652847..c3f600f 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1001,7 +1001,7 @@ static av_cold void common_init(H264Context *h)
     memset(h->pps.scaling_matrix8, 16, 2 * 64 * sizeof(uint8_t));
 }
 
-static int ff_h264_decode_extradata_internal(H264Context *h, const uint8_t *buf, int size)
+int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size)
 {
     AVCodecContext *avctx = h->s.avctx;
 
@@ -1058,15 +1058,6 @@ static int ff_h264_decode_extradata_internal(H264Context *h, const uint8_t *buf,
     return size;
 }
 
-int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size)
-{
-    int ret;
-    h->decoding_extradata = 1;
-    ret = ff_h264_decode_extradata_internal(h, buf, size);
-    h->decoding_extradata = 0;
-    return ret;
-}
-
 av_cold int ff_h264_decode_init(AVCodecContext *avctx)
 {
     H264Context *h = avctx->priv_data;
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 2be4809..af0c1e5 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -444,7 +444,6 @@ typedef struct H264Context {
     int nal_unit_type;
     uint8_t *rbsp_buffer[2];
     unsigned int rbsp_buffer_size[2];
-    int decoding_extradata;
 
     /**
      * Used to parse AVC variant of h264