summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/movenc.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 95da0759e2..892d454280 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1262,19 +1262,17 @@ static int mov_write_udta_tag(ByteIOContext *pb, MOVContext *mov,
mov_write_3gp_udta_tag(pb, s, "dscp", s->comment);
mov_write_3gp_udta_tag(pb, s, "albm", s->album);
mov_write_3gp_udta_tag(pb, s, "yrrc", "nil");
+ } else 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);
+ mov_write_string_tag(pb, "\251alb", s->album , 0);
+ mov_write_day_tag(pb, s->year, 0);
+ 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 {
- 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);
- mov_write_string_tag(pb, "\251alb", s->album , 0);
- mov_write_day_tag(pb, s->year, 0);
- 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);
}