* commit '8835c554':
  matroskadec: introduce resync function.

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