aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-01-28 16:03:50 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-01-28 16:03:50 +0000
commitea1664e33a79ea0f963f14c360815c855524c452 (patch)
treeb0ebc4a388d36c9dae5670dc214a40e81a43fee9
parentd97f2144357d6d7f64e1dddeae865d97a178918c (diff)
downloadffmpeg-ea1664e33a79ea0f963f14c360815c855524c452.tar.gz
finally set codec tags for mov/mp4/3gp muxers, this should not break anything, if it breaks anything, yell
Originally committed as revision 11652 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/movenc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index e9a14d3f2a..77641b3860 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1634,6 +1634,7 @@ AVOutputFormat mov_muxer = {
mov_write_packet,
mov_write_trailer,
.flags = AVFMT_GLOBALHEADER,
+ .codec_tag = (const AVCodecTag*[]){codec_movvideo_tags, codec_movaudio_tags, 0},
};
#endif
#ifdef CONFIG_TGP_MUXER
@@ -1649,6 +1650,7 @@ AVOutputFormat tgp_muxer = {
mov_write_packet,
mov_write_trailer,
.flags = AVFMT_GLOBALHEADER,
+ .codec_tag = (const AVCodecTag*[]){codec_3gp_tags, 0},
};
#endif
#ifdef CONFIG_MP4_MUXER
@@ -1664,6 +1666,7 @@ AVOutputFormat mp4_muxer = {
mov_write_packet,
mov_write_trailer,
.flags = AVFMT_GLOBALHEADER,
+ .codec_tag = (const AVCodecTag*[]){ff_mp4_obj_type, 0},
};
#endif
#ifdef CONFIG_PSP_MUXER
@@ -1679,6 +1682,7 @@ AVOutputFormat psp_muxer = {
mov_write_packet,
mov_write_trailer,
.flags = AVFMT_GLOBALHEADER,
+ .codec_tag = (const AVCodecTag*[]){ff_mp4_obj_type, 0},
};
#endif
#ifdef CONFIG_TG2_MUXER
@@ -1694,5 +1698,6 @@ AVOutputFormat tg2_muxer = {
mov_write_packet,
mov_write_trailer,
.flags = AVFMT_GLOBALHEADER,
+ .codec_tag = (const AVCodecTag*[]){codec_3gp_tags, 0},
};
#endif