diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:34:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:34:58 +0200 |
| commit | 2ce46a959c20ee72ad276e4b02bd50b522e1362a (patch) | |
| tree | 34d81dc165698c520409b284233935cb8fe49413 | |
| parent | 8ca0d74d5945339c70539d363d9132470731c8da (diff) | |
| parent | 9f7119b7fe003e94d72e81f3aa922568c2827dce (diff) | |
| download | ffmpeg-2ce46a959c20ee72ad276e4b02bd50b522e1362a.tar.gz | |
Merge commit '9f7119b7fe003e94d72e81f3aa922568c2827dce' into release/1.1
* commit '9f7119b7fe003e94d72e81f3aa922568c2827dce':
movenc: allow override of "writing application" tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/movenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index bba42782e0..d8f854c8a5 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2071,7 +2071,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); |