diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-25 16:37:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-25 17:38:29 +0100 |
| commit | 28cc7062c8766668afbcc0d4b3233fd3ed1c1948 (patch) | |
| tree | b65124094d5ae4302b89cb141c750cec7addac23 | |
| parent | 215759a9252b48bc242b611c4615292d7ba6ad88 (diff) | |
| download | ffmpeg-28cc7062c8766668afbcc0d4b3233fd3ed1c1948.tar.gz | |
avformat/isom: use ff_get_extradata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/isom.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index da789d618b..f6a4646f7a 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -458,13 +458,8 @@ int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext if (!len || (uint64_t)len > (1<<30)) return -1; av_free(st->codec->extradata); - if (ff_alloc_extradata(st->codec, len)) - return AVERROR(ENOMEM); - if ((ret = avio_read(pb, st->codec->extradata, len)) != len) { - av_freep(&st->codec->extradata); - st->codec->extradata_size = 0; - return ret < 0 ? ret : AVERROR_INVALIDDATA; - } + if ((ret = ff_get_extradata(st->codec, pb, len)) < 0) + return ret; if (st->codec->codec_id == AV_CODEC_ID_AAC) { MPEG4AudioConfig cfg = {0}; avpriv_mpeg4audio_get_config(&cfg, st->codec->extradata, |