Merge commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed'

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

Conflicts:
	libavcodec/hpeldsp_template.c

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

diff --cc libavcodec/hpeldsp.c
Simple merge

diff --cc libavcodec/hpeldsp_template.c
Simple merge