[FFmpeg-cvslog] Merge commit '8747fce91fca6bb8e9936497f2de05c905cf43b5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 16 12:01:22 2013 +0200| [a87cf3689ef2a1a53a022d664f3687d506ab08b1] | committer: Michael Niedermayer

Merge commit '8747fce91fca6bb8e9936497f2de05c905cf43b5'

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

Conflicts:
	libavformat/electronicarts.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a87cf3689ef2a1a53a022d664f3687d506ab08b1
---