-
Michael Niedermayer authored
* commit '8011ac91': hpeldsp_template: Detemplatize the code Conflicts: libavcodec/hpeldsp_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
6967cf3c
* commit '8011ac91': hpeldsp_template: Detemplatize the code Conflicts: libavcodec/hpeldsp_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>