[FFmpeg-cvslog] Merge commit '945673f792eb4141860ed66664156df685f7b7f0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 00:52:07 2014 +0100| [fdf4eb7911b37e49716b5a64004498ff308a8324] | committer: Michael Niedermayer

Merge commit '945673f792eb4141860ed66664156df685f7b7f0'

* commit '945673f792eb4141860ed66664156df685f7b7f0':
  dsputil_template: K&R formatting cosmetics

Conflicts:
	libavcodec/dsputil_template.c

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

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