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:13 +0100 |
| commit | e93bc3efbf756b5ffc402c64df38852829f10382 (patch) | |
| tree | 7c3c24eeba1c2e2123f539e36778e5465df0b3bc /libavformat/avidec.c | |
| parent | f04fc386dc23064cb5414bed56bd837e011ab09c (diff) | |
| download | ffmpeg-e93bc3efbf756b5ffc402c64df38852829f10382.tar.gz | |
avformat/avidec: use ff_get_extradata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 1c6b18c980..17eb245332 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -654,11 +654,8 @@ static int avi_read_header(AVFormatContext *s) st->codec->extradata_size = esize - 10 * 4; } else st->codec->extradata_size = size - 10 * 4; - if (ff_alloc_extradata(st->codec, st->codec->extradata_size)) + if (ff_get_extradata(st->codec, pb, st->codec->extradata_size) < 0) return AVERROR(ENOMEM); - avio_read(pb, - st->codec->extradata, - st->codec->extradata_size); } // FIXME: check if the encoder really did this correctly @@ -783,9 +780,8 @@ static int avi_read_header(AVFormatContext *s) st = s->streams[stream_index]; if (size<(1<<30)) { - if (ff_alloc_extradata(st->codec, size)) + if (ff_get_extradata(st->codec, pb, size) < 0) return AVERROR(ENOMEM); - avio_read(pb, st->codec->extradata, st->codec->extradata_size); } if (st->codec->extradata_size & 1) //FIXME check if the encoder really did this correctly |