summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohann <johannkoenig@google.com>2015-04-21 14:18:17 -0700
committerJohann <johannkoenig@google.com>2015-04-21 14:18:17 -0700
commit66b9933b8d2b329a8555be0c53a409cb548605ed (patch)
tree1e9deede2c4111f4f62746554671db2927613f7a
parent924d06a0755fdbdd90883f3fcc16b837f00362d1 (diff)
downloadlibvpx-66b9933b8d2b329a8555be0c53a409cb548605ed.tar.gz
Rename neon convolve avg file
Some build systems use just the basename for object files. Change-Id: I333e1107ee866f3906cc46476ef8d04c6200a8a0
-rw-r--r--vp9/common/arm/neon/vp9_convolve_avg_neon.c (renamed from vp9/common/arm/neon/vp9_avg_neon.c)0
-rw-r--r--vp9/common/arm/neon/vp9_convolve_avg_neon_asm.asm (renamed from vp9/common/arm/neon/vp9_avg_neon_asm.asm)0
-rw-r--r--vp9/vp9_common.mk4
3 files changed, 2 insertions, 2 deletions
diff --git a/vp9/common/arm/neon/vp9_avg_neon.c b/vp9/common/arm/neon/vp9_convolve_avg_neon.c
index 3a3db353e..3a3db353e 100644
--- a/vp9/common/arm/neon/vp9_avg_neon.c
+++ b/vp9/common/arm/neon/vp9_convolve_avg_neon.c
diff --git a/vp9/common/arm/neon/vp9_avg_neon_asm.asm b/vp9/common/arm/neon/vp9_convolve_avg_neon_asm.asm
index 7d2453021..7d2453021 100644
--- a/vp9/common/arm/neon/vp9_avg_neon_asm.asm
+++ b/vp9/common/arm/neon/vp9_convolve_avg_neon_asm.asm
diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk
index b221f37c4..a91bb1870 100644
--- a/vp9/vp9_common.mk
+++ b/vp9/vp9_common.mk
@@ -156,9 +156,9 @@ VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_loopfilter_neon.c
# neon with assembly and intrinsics implementations. If both are available
# prefer assembly.
ifeq ($(HAVE_NEON_ASM), yes)
-VP9_COMMON_SRCS-yes += common/arm/neon/vp9_avg_neon_asm$(ASM)
VP9_COMMON_SRCS-yes += common/arm/neon/vp9_convolve8_avg_neon_asm$(ASM)
VP9_COMMON_SRCS-yes += common/arm/neon/vp9_convolve8_neon_asm$(ASM)
+VP9_COMMON_SRCS-yes += common/arm/neon/vp9_convolve_avg_neon_asm$(ASM)
VP9_COMMON_SRCS-yes += common/arm/neon/vp9_convolve_neon.c
VP9_COMMON_SRCS-yes += common/arm/neon/vp9_copy_neon_asm$(ASM)
VP9_COMMON_SRCS-yes += common/arm/neon/vp9_idct16x16_1_add_neon_asm$(ASM)
@@ -174,9 +174,9 @@ VP9_COMMON_SRCS-yes += common/arm/neon/vp9_loopfilter_4_neon_asm$(ASM)
VP9_COMMON_SRCS-yes += common/arm/neon/vp9_reconintra_neon_asm$(ASM)
else
ifeq ($(HAVE_NEON), yes)
-VP9_COMMON_SRCS-yes += common/arm/neon/vp9_avg_neon.c
VP9_COMMON_SRCS-yes += common/arm/neon/vp9_convolve8_avg_neon.c
VP9_COMMON_SRCS-yes += common/arm/neon/vp9_convolve8_neon.c
+VP9_COMMON_SRCS-yes += common/arm/neon/vp9_convolve_avg_neon.c
VP9_COMMON_SRCS-yes += common/arm/neon/vp9_convolve_neon.c
VP9_COMMON_SRCS-yes += common/arm/neon/vp9_copy_neon.c
VP9_COMMON_SRCS-yes += common/arm/neon/vp9_idct16x16_1_add_neon.c