* commit '4620affa':
  m4vdec: K&R formatting cosmetics

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