Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fc3cdb00)

Conflicts:

	libavformat/matroskadec.c