[FFmpeg-cvslog] Merge commit 'e7373585f827d4ec05d952daa3877e8decfe3c08'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 26 14:40:49 2014 +0100| [32620691011186a0a3932bba8ddb078ce5312f22] | committer: Michael Niedermayer

Merge commit 'e7373585f827d4ec05d952daa3877e8decfe3c08'

* commit 'e7373585f827d4ec05d952daa3877e8decfe3c08':
  dsputil_template: Move bits that are used templatized into separate file

Conflicts:
	libavcodec/dsputil_template.c

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

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