[FFmpeg-cvslog] Merge commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 26 15:08:46 2014 +0100| [6967cf3c6c57dfdb831171f26f56fb1f521aed40] | committer: Michael Niedermayer

Merge commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed'

* commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed':
  hpeldsp_template: Detemplatize the code

Conflicts:
	libavcodec/hpeldsp_template.c

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

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