summaryrefslogtreecommitdiff
path: root/libavformat/movenc.c
diff options
context:
space:
mode:
authorRoine Gustafsson <roine@users.sourceforge.net>2004-12-17 19:23:53 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-12-17 19:23:53 +0000
commitcaacd4deeafacdebf14515672cea9cb21c73f8a9 (patch)
tree942529a03d32ce5807c7afceca9f2610448eccff /libavformat/movenc.c
parent90bb394dccacd10607153833a0aeba0d970dc8db (diff)
add -vtag and-atag support to mov patch by (Roine Gustafsson <roine at users sourceforge net>)
Originally committed as revision 3756 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/movenc.c')
-rw-r--r--libavformat/movenc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 1e025497d2..b9118b01da 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -257,6 +257,8 @@ static int mov_write_audio_tag(ByteIOContext *pb, MOVTrack* track)
put_be32(pb, 0); /* size */
+ tag = track->enc->codec_tag;
+ if (!tag)
tag = codec_get_tag(codec_movaudio_tags, track->enc->codec_id);
// if no mac fcc found, try with Microsoft tags
if (!tag)
@@ -453,6 +455,8 @@ static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track)
put_be32(pb, 0); /* size */
+ tag = track->enc->codec_tag;
+ if (!tag)
tag = codec_get_tag(codec_movvideo_tags, track->enc->codec_id);
// if no mac fcc found, try with Microsoft tags
if (!tag)