[FFmpeg-cvslog] Merge commit '3865ba7b21aef5d60183719e238361ec8797ab5a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 11 11:12:48 2013 +0200| [56090b5b80431bfd791dbe8cfd23c058214118da] | committer: Michael Niedermayer

Merge commit '3865ba7b21aef5d60183719e238361ec8797ab5a'

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

Conflicts:
	libavcodec/iff.c

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

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