[FFmpeg-cvslog] Merge commit '2c01ad8b206d326700974438f7193f22be416eb1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 26 14:59:50 2014 +0100| [e9c6b93bdaa600cd31f689218600baa999f8365e] | committer: Michael Niedermayer

Merge commit '2c01ad8b206d326700974438f7193f22be416eb1'

* commit '2c01ad8b206d326700974438f7193f22be416eb1':
  dsputil_template: Detemplatize the code

Conflicts:
	libavcodec/dsputil.c

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

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