diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-10-13 10:30:59 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-10-13 20:13:38 +0000 |
| commit | a807c68253b02cce8b9fbc87d7857c31d531a1ee (patch) | |
| tree | e4097d5fd4a2cf8dc03c6f97ebfadc4d20ce8ac2 /libavformat/ffmdec.c | |
| parent | 3fd79833e266aec2d77cf07092e8b1406fd307d4 (diff) | |
| download | ffmpeg-a807c68253b02cce8b9fbc87d7857c31d531a1ee.tar.gz | |
avformat: use ff_alloc_extradata()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavformat/ffmdec.c')
| -rw-r--r-- | libavformat/ffmdec.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 02cf790f87..b20ee131b6 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -278,9 +278,7 @@ static int ffm2_read_header(AVFormatContext *s) codec->flags2 = avio_rb32(pb); codec->debug = avio_rb32(pb); if (codec->flags & CODEC_FLAG_GLOBAL_HEADER) { - codec->extradata_size = avio_rb32(pb); - codec->extradata = av_malloc(codec->extradata_size); - if (!codec->extradata) + if (ff_alloc_extradata(codec, avio_rb32(pb))) return AVERROR(ENOMEM); avio_read(pb, codec->extradata, codec->extradata_size); } @@ -468,9 +466,7 @@ static int ffm_read_header(AVFormatContext *s) goto fail; } if (codec->flags & CODEC_FLAG_GLOBAL_HEADER) { - codec->extradata_size = avio_rb32(pb); - codec->extradata = av_malloc(codec->extradata_size); - if (!codec->extradata) + if (ff_alloc_extradata(codec, avio_rb32(pb))) return AVERROR(ENOMEM); avio_read(pb, codec->extradata, codec->extradata_size); } |