Merge commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 10:41:35 +0000 (12:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 10:41:35 +0000 (12:41 +0200)
commit69de229bb8818e97c88ad34840c9bd4a6854b647
tree142226762a8d8a8a73b0ae65001274e5201007f2
parent40beec6a431d5590aa42e5e5e3c10fe9a16fc9ed
parent6df478bf891b9fc5626e4a0b993899f310ba0a1c
Merge commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c'

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

Conflicts:
libavformat/matroskadec.c

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