[FFmpeg-devel] [PATCH 2/3] oggparsecelt: use ff_alloc_extradata()
James Almer
jamrial at gmail.com
Mon Oct 14 01:02:27 CEST 2013
Signed-off-by: James Almer <jamrial at gmail.com>
---
libavformat/oggparsecelt.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/libavformat/oggparsecelt.c b/libavformat/oggparsecelt.c
index afc4392..3c5f7ba 100644
--- a/libavformat/oggparsecelt.c
+++ b/libavformat/oggparsecelt.c
@@ -44,13 +44,10 @@ static int celt_header(AVFormatContext *s, int idx)
uint32_t version, sample_rate, nb_channels, frame_size;
uint32_t overlap, extra_headers;
- uint8_t *extradata;
- extradata = av_malloc(2 * sizeof(uint32_t) +
- FF_INPUT_BUFFER_PADDING_SIZE);
priv = av_malloc(sizeof(struct oggcelt_private));
- if (!extradata || !priv) {
- av_free(extradata);
+ if (ff_alloc_extradata(st->codec, 2 * sizeof(uint32_t)) || !priv) {
+ av_free(st->codec->extradata);
av_free(priv);
return AVERROR(ENOMEM);
}
@@ -67,16 +64,13 @@ static int celt_header(AVFormatContext *s, int idx)
st->codec->sample_rate = sample_rate;
st->codec->channels = nb_channels;
st->codec->frame_size = frame_size;
- av_free(st->codec->extradata);
- st->codec->extradata = extradata;
- st->codec->extradata_size = 2 * sizeof(uint32_t);
if (sample_rate)
avpriv_set_pts_info(st, 64, 1, sample_rate);
priv->extra_headers_left = 1 + extra_headers;
av_free(os->private);
os->private = priv;
- AV_WL32(extradata + 0, overlap);
- AV_WL32(extradata + 4, version);
+ AV_WL32(st->codec->extradata + 0, overlap);
+ AV_WL32(st->codec->extradata + 4, version);
return 1;
} else if (priv && priv->extra_headers_left) {
/* Extra headers (vorbiscomment) */
--
1.8.1.5
More information about the ffmpeg-devel
mailing list