[FFmpeg-cvslog] Merge commit '4cb4680c1087a2cd13d4b0c9167a2eb3147f99d8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 01:25:06 2014 +0100| [236874a57192ee120764a315c848faec40c6bb35] | committer: Michael Niedermayer

Merge commit '4cb4680c1087a2cd13d4b0c9167a2eb3147f99d8'

* commit '4cb4680c1087a2cd13d4b0c9167a2eb3147f99d8':
  x86: dsputil_x86.h: K&R formatting cosmetics

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

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