Merge commit '55d7f26e'

* commit '55d7f26e': hpeldsp_template: Move content to hpeldsp Conflicts: libavcodec/hpeldsp_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '55d7f26e'
* commit '55d7f26e': hpeldsp_template: Move content to hpeldsp Conflicts: libavcodec/hpeldsp_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
b7f0d39d · Michael Niedermayer · a49bdcde · 55d7f26e · b7f0d39d · a49bdcde
Commit b7f0d39d authored Mar 26, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 300 additions and 332 deletions

hpeldsp.c libavcodec/hpeldsp.c +300 -1

hpeldsp_template.c libavcodec/hpeldsp_template.c +0 -331

No files found.
--- a/libavcodec/hpeldsp.c
+++ b/libavcodec/hpeldsp.c
--- a/libavcodec/hpeldsp_template.c
+++ b/libavcodec/hpeldsp_template.c