virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/isom: use ff_get_extradata()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-25 16:37:42 +01:00
parent 215759a925
commit 28cc7062c8
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/isom.c
View File

@ -458,13 +458,8 @@ int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext
if (!len || (uint64_t)len > (1<<30)) if (!len || (uint64_t)len > (1<<30))
return -1; return -1;
av_free(st->codec->extradata); av_free(st->codec->extradata);
if (ff_alloc_extradata(st->codec, len)) if ((ret = ff_get_extradata(st->codec, pb, len)) < 0)
return AVERROR(ENOMEM); return ret;
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 (st->codec->codec_id == AV_CODEC_ID_AAC) { if (st->codec->codec_id == AV_CODEC_ID_AAC) {
MPEG4AudioConfig cfg = {0}; MPEG4AudioConfig cfg = {0};
avpriv_mpeg4audio_get_config(&cfg, st->codec->extradata, avpriv_mpeg4audio_get_config(&cfg, st->codec->extradata,