[FFmpeg-cvslog] Merge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521'
Michael Niedermayer
git at videolan.org
Fri May 3 13:39:33 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 3 13:16:34 2013 +0200| [6537827189153cd1c6944403a48d7ff76f7b8228] | committer: Michael Niedermayer
Merge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521'
* commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521':
matroskaenc: add an option to put the index at the start of the file
Conflicts:
doc/muxers.texi
libavformat/matroskaenc.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6537827189153cd1c6944403a48d7ff76f7b8228
---
More information about the ffmpeg-cvslog
mailing list