summaryrefslogtreecommitdiff
path: root/libavformat/aiff.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-02-25 12:29:34 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-02-25 12:29:34 +0000
commitb8d3daca6277911a86793b6efdbe517a5fe21360 (patch)
tree6b66ebeb0eb1b99fc2115f9846f0503bb2f9e3f4 /libavformat/aiff.c
parent4c638f0c7cf1060a9762bce19cb5d9172561093f (diff)
downloadffmpeg-b8d3daca6277911a86793b6efdbe517a5fe21360.tar.gz
support QDM2 in aiff, QDM2.aif
Originally committed as revision 12204 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/aiff.c')
-rw-r--r--libavformat/aiff.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/aiff.c b/libavformat/aiff.c
index c3a245e570..7ff75b6e30 100644
--- a/libavformat/aiff.c
+++ b/libavformat/aiff.c
@@ -36,6 +36,7 @@ static const AVCodecTag codec_aiff_tags[] = {
{ CODEC_ID_ADPCM_G726, MKTAG('G','7','2','6') },
{ CODEC_ID_PCM_S16LE, MKTAG('s','o','w','t') },
{ CODEC_ID_ADPCM_IMA_QT, MKTAG('i','m','a','4') },
+ { CODEC_ID_QDM2, MKTAG('Q','D','M','2') },
{ 0, 0 },
};
@@ -366,6 +367,13 @@ static int aiff_read_header(AVFormatContext *s,
}
url_fskip(pb, size - 8);
break;
+ case MKTAG('w', 'a', 'v', 'e'):
+ st->codec->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!st->codec->extradata)
+ return AVERROR(ENOMEM);
+ st->codec->extradata_size = size;
+ get_buffer(pb, st->codec->extradata, size);
+ break;
default: /* Jump */
if (size & 1) /* Always even aligned */
size++;