Merge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 11:16:34 +0000 (13:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 11:16:34 +0000 (13:16 +0200)
commit6537827189153cd1c6944403a48d7ff76f7b8228
treee713d2f95acea7b929949d6836f037fc71e5a359
parent2e0cc34292d25526f9b91752aa980fd740a0edf7
parente3b225a4fe0ff1e64a220b757c6f0a5cf9258521
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@gmx.at>
Changelog
doc/muxers.texi
libavformat/matroskaenc.c
libavformat/version.h