* commit '8747fce9':
  electronicarts: K&R formatting cosmetics

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