[FFmpeg-cvslog] Merge commit '503dda7d4f5b4d76eed0239e9da66993a182b009'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 00:18:38 2014 +0100| [db94b144e95f540e6fc1f010fe229d1c32ba0aa8] | committer: Michael Niedermayer

Merge commit '503dda7d4f5b4d76eed0239e9da66993a182b009'

* commit '503dda7d4f5b4d76eed0239e9da66993a182b009':
  dsputil.h: K&R formatting cosmetics

Conflicts:
	libavcodec/dsputil.h

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

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