[FFmpeg-cvslog] Merge commit 'e6496ea7e7ea7355167a1ccbe67a7199d446a654'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 13 09:50:42 2013 +0200| [90c8863a749432608b05d2b7d93475e8ebd62bbb] | committer: Michael Niedermayer

Merge commit 'e6496ea7e7ea7355167a1ccbe67a7199d446a654'

* commit 'e6496ea7e7ea7355167a1ccbe67a7199d446a654':
  4xm: K&R formatting cosmetics

Conflicts:
	libavformat/4xm.c

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

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