[FFmpeg-cvslog] Merge commit 'f812eeda17e38797df5cb733ce99cdfd829d84ca'
Michael Niedermayer
git at videolan.org
Wed Aug 28 11:50:48 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 28 11:32:02 2013 +0200| [87d38ad803b81dd4a4afb6607b3863605403dc9c] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87d38ad803b81dd4a4afb6607b3863605403dc9c
---
More information about the ffmpeg-cvslog
mailing list