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:14:32 +0100 |
| commit | b59740eae53786dd166871f19d30758630a40171 (patch) | |
| tree | ec48d53323e27f801bad019f780a947e8aeb561b /libavformat/aiffdec.c | |
| parent | 482b2042cdb05f77cc4d82a07c010203ac7a4f08 (diff) | |
| download | ffmpeg-b59740eae53786dd166871f19d30758630a40171.tar.gz | |
avformat/aiffdec: use ff_get_extradata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aiffdec.c')
| -rw-r--r-- | libavformat/aiffdec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 6f82d9339a..c3620716eb 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -278,9 +278,8 @@ static int aiff_read_header(AVFormatContext *s) case MKTAG('w', 'a', 'v', 'e'): if ((uint64_t)size > (1<<30)) return -1; - 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, size); if (st->codec->codec_id == AV_CODEC_ID_QDM2 && size>=12*4 && !st->codec->block_align) { st->codec->block_align = AV_RB32(st->codec->extradata+11*4); aiff->block_duration = AV_RB32(st->codec->extradata+9*4); |