mirror of https://git.ffmpeg.org/ffmpeg.git
h264: remove redundant parts of old slice in extradata code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
99321d1b03
commit
14f79ba18f
|
@ -1001,7 +1001,7 @@ static av_cold void common_init(H264Context *h)
|
||||||
memset(h->pps.scaling_matrix8, 16, 2 * 64 * sizeof(uint8_t));
|
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;
|
AVCodecContext *avctx = h->s.avctx;
|
||||||
|
|
||||||
|
@ -1058,15 +1058,6 @@ static int ff_h264_decode_extradata_internal(H264Context *h, const uint8_t *buf,
|
||||||
return size;
|
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)
|
av_cold int ff_h264_decode_init(AVCodecContext *avctx)
|
||||||
{
|
{
|
||||||
H264Context *h = avctx->priv_data;
|
H264Context *h = avctx->priv_data;
|
||||||
|
|
|
@ -444,7 +444,6 @@ typedef struct H264Context {
|
||||||
int nal_unit_type;
|
int nal_unit_type;
|
||||||
uint8_t *rbsp_buffer[2];
|
uint8_t *rbsp_buffer[2];
|
||||||
unsigned int rbsp_buffer_size[2];
|
unsigned int rbsp_buffer_size[2];
|
||||||
int decoding_extradata;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Used to parse AVC variant of h264
|
* Used to parse AVC variant of h264
|
||||||
|
|
Loading…
Reference in New Issue