diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 21:36:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 21:47:58 +0200 |
| commit | cfcb9f5e3628fc8e768836cd4b9b377c24221cf9 (patch) | |
| tree | 8d232eb8465d8157f48ed34e5f08d0ba8d04182d /libavformat | |
| parent | 4ff0c61ba80016bdda4ca3002c381a9f2f3cc8c8 (diff) | |
| parent | e95c7a61852cc5b9ce5445ff034b87553e61958a (diff) | |
Merge commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a'
* commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a':
mov: Preserve the metadata even when bit-exactness is requested
Conflicts:
libavformat/movenc.c
tests/ref/vsynth/vsynth1-mpeg4
tests/ref/vsynth/vsynth2-mpeg4
See: a17ee4117dcb2922f57da33b8401d11b06e81cba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index d4bfed31d1..42529ecd5a 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2573,7 +2573,7 @@ static int mov_write_track_udta_tag(AVIOContext *pb, MOVMuxContext *mov, int ret, size; uint8_t *buf; - if (!st || mov->fc->flags & AVFMT_FLAG_BITEXACT) + if (!st) return 0; ret = avio_open_dyn_buf(&pb_buf); @@ -2919,9 +2919,10 @@ 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); - if (!mov->exact && - !mov_write_string_metadata(s, pb, "\251too", "encoding_tool", 1)) - mov_write_string_tag(pb, "\251too", LIBAVFORMAT_IDENT, 0, 1); + if (!mov_write_string_metadata(s, pb, "\251too", "encoding_tool", 1)) { + if (!(s->flags & AVFMT_FLAG_BITEXACT)) + 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); |