aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Stebbins <stebbins@jetheaddev.com>2014-03-03 20:20:15 +0000
committerSean McGovern <gseanmcg@gmail.com>2014-04-14 18:34:29 -0400
commit9f7119b7fe003e94d72e81f3aa922568c2827dce (patch)
treeaa84bb249f67229ec69823a8cb5953a4471a6a39
parentd375d6395c0a5203932d89c087f77a5757a08138 (diff)
downloadffmpeg-9f7119b7fe003e94d72e81f3aa922568c2827dce.tar.gz
movenc: allow override of "writing application" tag
Signed-off-by: Tim Walker <tdskywalker@gmail.com> CC: libav-stable@libav.org (cherry picked from commit 565e0c6d866ce08d4b06427456d3d1f4fd856e9c)
-rw-r--r--libavformat/movenc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 39495203df..b7b64779e7 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1806,7 +1806,8 @@ static int mov_write_ilst_tag(AVIOContext *pb, MOVMuxContext *mov,
mov_write_string_metadata(s, pb, "\251wrt", "composer" , 1);
mov_write_string_metadata(s, pb, "\251alb", "album" , 1);
mov_write_string_metadata(s, pb, "\251day", "date" , 1);
- mov_write_string_tag(pb, "\251too", LIBAVFORMAT_IDENT, 0, 1);
+ if (!mov_write_string_metadata(s, pb, "\251too", "encoding_tool", 1))
+ mov_write_string_tag(pb, "\251too", LIBAVFORMAT_IDENT, 0, 1);
mov_write_string_metadata(s, pb, "\251cmt", "comment" , 1);
mov_write_string_metadata(s, pb, "\251gen", "genre" , 1);
mov_write_string_metadata(s, pb, "\251cpy", "copyright", 1);