RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-12-18 14:52:44 +01:00
parent 99321d1b03
commit 14f79ba18f
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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