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 /libavcodec/mpl2dec.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 'libavcodec/mpl2dec.c')
0 files changed, 0 insertions, 0 deletions