[SCM] libav/wheezy-security: movenc: allow override of "writing application" tag
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 1 21:36:13 UTC 2014
The following commit has been merged in the wheezy-security branch:
commit db52f056c3d26c59feb9156a9deeaf8e0089b86e
Author: John Stebbins <stebbins at jetheaddev.com>
Date: Mon Mar 3 20:20:15 2014 +0000
movenc: allow override of "writing application" tag
Signed-off-by: Tim Walker <tdskywalker at gmail.com>
CC: libav-stable at libav.org
(cherry picked from commit 565e0c6d866ce08d4b06427456d3d1f4fd856e9c)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 85b5667..0b774f5 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1626,7 +1626,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);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list