Browse Source

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.1
Michael Niedermayer 13 years ago
parent
commit
14f79ba18f
2 changed files with 1 additions and 11 deletions
  1. +1
    -10
      libavcodec/h264.c
  2. +0
    -1
      libavcodec/h264.h

+ 1
- 10
libavcodec/h264.c View File

@@ -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;


+ 0
- 1
libavcodec/h264.h View File

@@ -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


Loading…
Cancel
Save