* commit 'e3b225a4':
  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>