diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 11:32:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 11:33:59 +0200 |
| commit | 87d38ad803b81dd4a4afb6607b3863605403dc9c (patch) | |
| tree | da0b988d1b503c6ebf2c4e0d1fa4f5dfd6e4d26e /libavformat/matroskaenc.c | |
| parent | 70106e73c5b4157fcaed131907ed10ab2de83f5d (diff) | |
| parent | f812eeda17e38797df5cb733ce99cdfd829d84ca (diff) | |
| download | ffmpeg-87d38ad803b81dd4a4afb6607b3863605403dc9c.tar.gz | |
Merge commit 'f812eeda17e38797df5cb733ce99cdfd829d84ca'
* commit 'f812eeda17e38797df5cb733ce99cdfd829d84ca':
matroskaenc: Fix writing TRACKDEFAULTFLAG
Conflicts:
libavformat/matroskaenc.c
tests/fate/wavpack.mak
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 92df6cbef1..aa979eab6e 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -613,9 +613,11 @@ static int mkv_write_tracks(AVFormatContext *s) put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, tag->value); } - if (default_stream_exists) { + // The default value for TRACKFLAGDEFAULT is 1, so add element + // if we need to clear it. + if (default_stream_exists && !(st->disposition & AV_DISPOSITION_DEFAULT)) put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGDEFAULT, !!(st->disposition & AV_DISPOSITION_DEFAULT)); - } + if (st->disposition & AV_DISPOSITION_FORCED) put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGFORCED, 1); |