diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 01:50:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 01:50:17 +0100 |
| commit | 9827f3db88c0dbcca3070dbd88af131dbcc7e84c (patch) | |
| tree | 1681fe1064388270b24908828e35958cc81abce1 /libavformat/movenc.c | |
| parent | 4cb6814160d074df5d7cbb5b4a2059e7757bbaa6 (diff) | |
| parent | 565e0c6d866ce08d4b06427456d3d1f4fd856e9c (diff) | |
| download | ffmpeg-9827f3db88c0dbcca3070dbd88af131dbcc7e84c.tar.gz | |
Merge commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c'
* commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c':
movenc: allow override of "writing application" tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.c')
| -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 80ddd2c78f..8b1816a3c7 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2208,7 +2208,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); |