diff options
| author | Johann <johannkoenig@google.com> | 2014-05-16 08:14:18 -0700 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2014-05-16 08:20:13 -0700 |
| commit | f625b2ac9344990c160f7293073e0ffd6560361f (patch) | |
| tree | 5033fef16b5e837850fb76ff614f6ef73bc2c77a | |
| parent | 2f6f955a178b120f89b3b554b3a12c4a8af82838 (diff) | |
| download | libvpx-f625b2ac9344990c160f7293073e0ffd6560361f.tar libvpx-f625b2ac9344990c160f7293073e0ffd6560361f.tar.gz libvpx-f625b2ac9344990c160f7293073e0ffd6560361f.tar.bz2 libvpx-f625b2ac9344990c160f7293073e0ffd6560361f.zip | |
Correct HAVE_NEON_ASM define
These optimizations are currently disabled.
Change-Id: I19c58c9cb82d017638b86196641b9e001dfa798b
| -rw-r--r-- | vp8/common/arm/reconintra_arm.c | 2 | ||||
| -rw-r--r-- | vp8/vp8_common.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vp8/common/arm/reconintra_arm.c b/vp8/common/arm/reconintra_arm.c index 765fc3ad8..e55a33cbb 100644 --- a/vp8/common/arm/reconintra_arm.c +++ b/vp8/common/arm/reconintra_arm.c @@ -14,7 +14,7 @@ #include "vp8/common/blockd.h" #include "vpx_mem/vpx_mem.h" -#if HAVE_NEON_ARM +#if HAVE_NEON_ASM extern void vp8_build_intra_predictors_mby_neon_func( unsigned char *y_buffer, unsigned char *ypred_ptr, diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index 911608c37..8282547ea 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -158,10 +158,10 @@ VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/vp8_variance_halfpixvar16x16_ VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6$(ASM) # common (neon) -VP8_COMMON_SRCS-$(ARCH_NEON_ASM) += common/arm/reconintra_arm.c +#VP8_COMMON_SRCS-$(HAVE_NEON_ASM) += common/arm/reconintra_arm.c VP8_COMMON_SRCS-$(HAVE_NEON_ASM) += common/arm/neon/loopfilter_neon$(ASM) VP8_COMMON_SRCS-$(HAVE_NEON_ASM) += common/arm/neon/loopfiltersimpleverticaledge_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_NEON_ASM) += common/arm/neon/buildintrapredictorsmby_neon$(ASM) +#VP8_COMMON_SRCS-$(HAVE_NEON_ASM) += common/arm/neon/buildintrapredictorsmby_neon$(ASM) VP8_COMMON_SRCS-$(HAVE_NEON_ASM) += common/arm/neon/idct_blk_neon.c VP8_COMMON_SRCS-$(HAVE_NEON_ASM) += common/arm/neon/idct_dequant_0_2x_neon$(ASM) VP8_COMMON_SRCS-$(HAVE_NEON_ASM) += common/arm/neon/idct_dequant_full_2x_neon$(ASM) |