Browse Source

avformat/aiffdec: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 11 years ago
parent
commit
b59740eae5
1 changed files with 1 additions and 2 deletions
  1. +1
    -2
      libavformat/aiffdec.c

+ 1
- 2
libavformat/aiffdec.c View File

@@ -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);


Loading…
Cancel
Save