[FFmpeg-cvslog] Merge commit 'bb12c2e9c00e3d3c393885849b8fa31cd849dc92'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 00:31:48 2014 +0100| [dd7c2e9bce0ca704c6dd725cb7b1cb3bedacdb75] | committer: Michael Niedermayer

Merge commit 'bb12c2e9c00e3d3c393885849b8fa31cd849dc92'

* commit 'bb12c2e9c00e3d3c393885849b8fa31cd849dc92':
  dsputil: K&R formatting cosmetics

Conflicts:
	libavcodec/dsputil.c

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

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