summaryrefslogtreecommitdiff
path: root/libavformat/isom.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-09-03 19:05:22 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-09-03 19:05:22 +0000
commitd4a240cbc9e75e943fa98b9e9e0afe60644b6033 (patch)
treeaff2543ff3b51f9ad16ac85cb2c1f013827f443b /libavformat/isom.c
parent395206f6b1e445258cba1bdffb82060939030bb4 (diff)
ac3 muxing support in mov/mp4/m4v
Originally committed as revision 15184 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/isom.c')
-rw-r--r--libavformat/isom.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index a21caa1cff..cec5809ff8 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -48,6 +48,7 @@ const AVCodecTag ff_mp4_obj_type[] = {
{ CODEC_ID_PNG , 109 },
{ CODEC_ID_JPEG2000 , 110 }, /* 15444-1 */
{ CODEC_ID_VC1 , 163 },
+ { CODEC_ID_AC3 , 165 },
{ CODEC_ID_VORBIS , 221 }, /* non standard, gpac uses it */
{ CODEC_ID_DVD_SUBTITLE, 224 }, /* non standard, see unsupported-embedded-subs-2.mp4 */
{ CODEC_ID_QCELP , 225 },
@@ -187,6 +188,7 @@ const AVCodecTag codec_movaudio_tags[] = {
/* { CODEC_ID_OGG_VORBIS, MKTAG('O', 'g', 'g', 'S') }, *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */
{ CODEC_ID_AAC, MKTAG('m', 'p', '4', 'a') }, /* MPEG-4 AAC */
+ { CODEC_ID_AC3, MKTAG('a', 'c', '-', '3') }, /* ETSI TS 102 366 Annex F */
{ CODEC_ID_AMR_NB, MKTAG('s', 'a', 'm', 'r') }, /* AMR-NB 3gp */
{ CODEC_ID_AMR_WB, MKTAG('s', 'a', 'w', 'b') }, /* AMR-WB 3gp */