summaryrefslogtreecommitdiff
path: root/libavformat/riff.c
diff options
context:
space:
mode:
authorDavid Conrad <lessen42@gmail.com>2006-08-08 22:16:34 +0000
committerRoberto Togni <r_togni@tiscali.it>2006-08-08 22:16:34 +0000
commit8331891957555c66cfeddb8394059c920425ef1a (patch)
tree7f1cff33e71f0043804834dcc2e8937893af4da8 /libavformat/riff.c
parent1b87c402450b6ad942431f83e56748eef05769fa (diff)
Support AAC audio in AVI with tag 0xff
Patch by David Conrad ( davedc_ | umbc edu ) Originally committed as revision 5963 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/riff.c')
-rw-r--r--libavformat/riff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index ddae35b806..2ccbc8c567 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -176,6 +176,7 @@ const CodecTag codec_wav_tags[] = {
{ CODEC_ID_WMAV1, 0x160 },
{ CODEC_ID_WMAV2, 0x161 },
{ CODEC_ID_AAC, 0x706d },
+ { CODEC_ID_MPEG4AAC, 0xff },
{ CODEC_ID_VORBIS, ('V'<<8)+'o' }, //HACK/FIXME, does vorbis in WAV/AVI have an (in)official id?
{ CODEC_ID_SONIC, 0x2048 },
{ CODEC_ID_SONIC_LS, 0x2048 },