From 283c9a8ed45da821545a294ca5da23be41ba6ee2 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Thu, 12 Jun 2008 00:55:49 +0000 Subject: [PATCH] don't write double sets of metadata in mov, only write usual ones Originally committed as revision 13751 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/movenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index f3784959b..95da0759e 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1263,9 +1263,6 @@ static int mov_write_udta_tag(ByteIOContext *pb, MOVContext *mov, mov_write_3gp_udta_tag(pb, s, "albm", s->album); mov_write_3gp_udta_tag(pb, s, "yrrc", "nil"); } else { - /* iTunes meta data */ - mov_write_meta_tag(pb, mov, s); - if(mov->mode == MODE_MOV){ // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4 mov_write_string_tag(pb, "\251nam", s->title , 0); mov_write_string_tag(pb, "\251aut", s->author , 0); @@ -1274,6 +1271,9 @@ static int mov_write_udta_tag(ByteIOContext *pb, MOVContext *mov, mov_write_string_tag(pb, "\251enc", LIBAVFORMAT_IDENT, 0); mov_write_string_tag(pb, "\251des", s->comment , 0); mov_write_string_tag(pb, "\251gen", s->genre , 0); + } else { + /* iTunes meta data */ + mov_write_meta_tag(pb, mov, s); } } return updateSize(pb, pos); -- 2.11.0