[FFmpeg-cvslog] Merge commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 28 12:41:35 2014 +0200| [69de229bb8818e97c88ad34840c9bd4a6854b647] | committer: Michael Niedermayer

Merge commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c'

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

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69de229bb8818e97c88ad34840c9bd4a6854b647
---