* commit '6df478bf':
  matroskadec: split parsing tracks into a separate function

Conflicts:
	libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>