* commit '3865ba7b':
  iff: K&R formatting cosmetics

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