summaryrefslogtreecommitdiff
path: root/vpx_dsp
diff options
context:
space:
mode:
authorLinfeng Zhang <linfengz@google.com>2016-10-01 00:07:50 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-10-01 00:07:51 +0000
commitda14d23e449ceec6e804b5942df93b06a9924d6b (patch)
tree4426af615804c2ef248ed77f597d30c7cc37e866 /vpx_dsp
parentedbca72a53d6657258f5f2db4306bc70b504a0ad (diff)
parentca2fe7a8c722ef995e2db56eb3b68032f887c89d (diff)
downloadlibvpx-da14d23e449ceec6e804b5942df93b06a9924d6b.tar
libvpx-da14d23e449ceec6e804b5942df93b06a9924d6b.tar.gz
libvpx-da14d23e449ceec6e804b5942df93b06a9924d6b.tar.bz2
libvpx-da14d23e449ceec6e804b5942df93b06a9924d6b.zip
Merge "Refactor vpx lpf NEON files (step 2/2)"
Diffstat (limited to 'vpx_dsp')
-rw-r--r--vpx_dsp/arm/loopfilter_16_neon.asm (renamed from vpx_dsp/arm/loopfilter_mb_neon.asm)0
-rw-r--r--vpx_dsp/arm/loopfilter_neon.c (renamed from vpx_dsp/arm/loopfilter_mb_neon.c)0
-rw-r--r--vpx_dsp/vpx_dsp.mk4
3 files changed, 2 insertions, 2 deletions
diff --git a/vpx_dsp/arm/loopfilter_mb_neon.asm b/vpx_dsp/arm/loopfilter_16_neon.asm
index 730c40de0..730c40de0 100644
--- a/vpx_dsp/arm/loopfilter_mb_neon.asm
+++ b/vpx_dsp/arm/loopfilter_16_neon.asm
diff --git a/vpx_dsp/arm/loopfilter_mb_neon.c b/vpx_dsp/arm/loopfilter_neon.c
index fc080163b..fc080163b 100644
--- a/vpx_dsp/arm/loopfilter_mb_neon.c
+++ b/vpx_dsp/arm/loopfilter_neon.c
diff --git a/vpx_dsp/vpx_dsp.mk b/vpx_dsp/vpx_dsp.mk
index 5a5304883..66062b6e7 100644
--- a/vpx_dsp/vpx_dsp.mk
+++ b/vpx_dsp/vpx_dsp.mk
@@ -137,12 +137,12 @@ DSP_SRCS-$(HAVE_AVX2) += x86/loopfilter_avx2.c
ifeq ($(HAVE_NEON_ASM),yes)
DSP_SRCS-yes += arm/loopfilter_vertical_4_dual_neon.c
-DSP_SRCS-yes += arm/loopfilter_mb_neon$(ASM)
+DSP_SRCS-yes += arm/loopfilter_16_neon$(ASM)
DSP_SRCS-yes += arm/loopfilter_8_neon$(ASM)
DSP_SRCS-yes += arm/loopfilter_4_neon$(ASM)
else
ifeq ($(HAVE_NEON),yes)
-DSP_SRCS-yes += arm/loopfilter_mb_neon.c
+DSP_SRCS-yes += arm/loopfilter_neon.c
endif # HAVE_NEON
endif # HAVE_NEON_ASM