* commit '84cfce9f':
  matroskadec: K&R formatting cosmetics

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