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:23:55 +0100 |
| commit | c633aeba45abf092f98b66690df81b7dfd864e29 (patch) | |
| tree | 24d8f8900600d000357404c6e0050509c7549afa | |
| parent | 773f2a563f7a450708be021b36dc80bcee7cae3e (diff) | |
| download | ffmpeg-c633aeba45abf092f98b66690df81b7dfd864e29.tar.gz | |
avformat/ffmdec: use ff_get_extradata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/ffmdec.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 679d926da1..9d89b16643 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -280,9 +280,8 @@ static int ffm2_read_header(AVFormatContext *s) codec->flags2 = avio_rb32(pb); codec->debug = avio_rb32(pb); if (codec->flags & CODEC_FLAG_GLOBAL_HEADER) { - if (ff_alloc_extradata(codec, avio_rb32(pb))) + if (ff_get_extradata(codec, pb, avio_rb32(pb)) < 0) return AVERROR(ENOMEM); - avio_read(pb, codec->extradata, codec->extradata_size); } avio_seek(pb, next, SEEK_SET); id = avio_rb32(pb); @@ -468,9 +467,8 @@ static int ffm_read_header(AVFormatContext *s) goto fail; } if (codec->flags & CODEC_FLAG_GLOBAL_HEADER) { - if (ff_alloc_extradata(codec, avio_rb32(pb))) + if (ff_get_extradata(codec, pb, avio_rb32(pb)) < 0) return AVERROR(ENOMEM); - avio_read(pb, codec->extradata, codec->extradata_size); } } |