diff options
| author | Johann <johannkoenig@google.com> | 2015-04-21 15:45:29 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-04-21 15:45:29 -0700 |
| commit | 931c0a954f659cf0210a6abde660e466c01b91e5 (patch) | |
| tree | eb5595e02d5d961dae6667a61d8b7ad17d506949 | |
| parent | 8b17f7f4eb86107ac9ed9e31a2a8bba238a1247a (diff) | |
| parent | 66b9933b8d2b329a8555be0c53a409cb548605ed (diff) | |
| download | libvpx-931c0a954f659cf0210a6abde660e466c01b91e5.tar.gz | |
Merge "Rename neon convolve avg file"
| -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.mk | 4 |
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 |