Merge commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 14:08:46 +0000 (15:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 14:08:46 +0000 (15:08 +0100)
commit6967cf3c6c57dfdb831171f26f56fb1f521aed40
tree0454a3382771abf126d4a8a6cbe771e5a43827d6
parente9c6b93bdaa600cd31f689218600baa999f8365e
parent8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed
Merge commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed'

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

Conflicts:
libavcodec/hpeldsp_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hpeldsp.c
libavcodec/hpeldsp_template.c