* commit '10aa44aa':
  avidec: K&R formatting cosmetics

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