aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2009-11-22 18:13:22 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2009-11-22 18:13:22 +0000
commitc3988a59ce13161aa6a500ed0c13130536ccec9d (patch)
treeb6d061bffb0b80a7db8b90acf6d1d79d176b3191
parent79de9c83e0bb8104537d502a8b6f7c8e03f91346 (diff)
downloadffmpeg-c3988a59ce13161aa6a500ed0c13130536ccec9d.tar.gz
Add MP4 object type for ALS.
Originally committed as revision 20578 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/isom.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 5830ce94fd..ae16532e30 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -32,6 +32,7 @@ const AVCodecTag ff_mp4_obj_type[] = {
{ CODEC_ID_MPEG4 , 0x20 },
{ CODEC_ID_H264 , 0x21 },
{ CODEC_ID_AAC , 0x40 },
+ { CODEC_ID_MP4ALS , 0x40 }, /* 14496-3 ALS */
{ CODEC_ID_MPEG2VIDEO, 0x61 }, /* MPEG2 Main */
{ CODEC_ID_MPEG2VIDEO, 0x60 }, /* MPEG2 Simple */
{ CODEC_ID_MPEG2VIDEO, 0x62 }, /* MPEG2 SNR */