[FFmpeg-cvslog] Merge commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 25 13:45:25 2014 +0200| [8f3d3e5f8373d64f4b05dd1908c048dc0e49e21f] | committer: Michael Niedermayer

Merge commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b'

* commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b':
  concat: K&R formatting cosmetics

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

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