From aae8975ffbb536f18df51e8f00eaa7b0117d16c9 Mon Sep 17 00:00:00 2001 From: James Almer Date: Sun, 13 Oct 2013 20:02:26 -0300 Subject: oggparseopus: use ff_alloc_extradata() Signed-off-by: James Almer Reviewed-by: Nicolas George Signed-off-by: Michael Niedermayer --- libavformat/oggparseopus.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'libavformat/oggparseopus.c') diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c index da753263d0..78aa333187 100644 --- a/libavformat/oggparseopus.c +++ b/libavformat/oggparseopus.c @@ -41,7 +41,6 @@ static int opus_header(AVFormatContext *avf, int idx) AVStream *st = avf->streams[idx]; struct oggopus_private *priv = os->private; uint8_t *packet = os->buf + os->pstart; - uint8_t *extradata; if (!priv) { priv = os->private = av_mallocz(sizeof(*priv)); @@ -60,13 +59,10 @@ static int opus_header(AVFormatContext *avf, int idx) /*gain = AV_RL16(packet + 16);*/ /*channel_map = AV_RL8 (packet + 18);*/ - extradata = av_malloc(os->psize + FF_INPUT_BUFFER_PADDING_SIZE); - if (!extradata) + if (ff_alloc_extradata(st->codec, os->psize)) return AVERROR(ENOMEM); - memcpy(extradata, packet, os->psize); - st->codec->extradata = extradata; - st->codec->extradata_size = os->psize; + memcpy(st->codec->extradata, packet, os->psize); st->codec->sample_rate = 48000; avpriv_set_pts_info(st, 64, 1, 48000); -- cgit v1.2.3