summaryrefslogtreecommitdiff
path: root/libavcodec/hpeldsp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-15 15:20:30 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-15 15:20:30 +0100
commit28207bfafb905ce02fcc549a27921ac085714623 (patch)
tree787e75d1ee4f7e6338326f46846a1c95aac6dd81 /libavcodec/hpeldsp.c
parent19fc3c0122ebbffd5d8678cc70750503545fa7f8 (diff)
parentc65d67ef50241886b9749e88fd333c52090f70c7 (diff)
Merge commit 'c65d67ef50241886b9749e88fd333c52090f70c7'
* commit 'c65d67ef50241886b9749e88fd333c52090f70c7': aarch64: hpeldsp NEON optimizations Conflicts: libavcodec/hpeldsp.c libavcodec/hpeldsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hpeldsp.c')
-rw-r--r--libavcodec/hpeldsp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/hpeldsp.c b/libavcodec/hpeldsp.c
index 473102ddde..aaa5e2df04 100644
--- a/libavcodec/hpeldsp.c
+++ b/libavcodec/hpeldsp.c
@@ -54,6 +54,8 @@ av_cold void ff_hpeldsp_init(HpelDSPContext *c, int flags)
hpel_funcs(avg, [3], 2);
hpel_funcs(avg_no_rnd,, 16);
+ if (ARCH_AARCH64)
+ ff_hpeldsp_init_aarch64(c, flags);
if (ARCH_ALPHA)
ff_hpeldsp_init_alpha(c, flags);
if (ARCH_ARM)