[FFmpeg-cvslog] Merge commit '037fea388e0df2a22441bc1ed86794152161baf1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov  2 10:19:12 2013 +0100| [0b82fdcc469ec8f5dd4affe1fe5ae8710b373cd2] | committer: Michael Niedermayer

Merge commit '037fea388e0df2a22441bc1ed86794152161baf1'

* commit '037fea388e0df2a22441bc1ed86794152161baf1':
  flashsv: K&R formatting cosmetics

Conflicts:
	libavcodec/flashsv.c

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

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