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)
* commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed':
  hpeldsp_template: Detemplatize the code

Conflicts:
libavcodec/hpeldsp_template.c

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

Simple merge
Simple merge