[FFmpeg-cvslog] Merge commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 12 21:35:48 2014 +0100| [990f956ce66b39c997b98cdef9d031201b5a254a] | committer: Michael Niedermayer

Merge commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f'

* commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f':
  copy_block: K&R formatting cosmetics

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

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