From 587ff646f69975bd1f589eeac3c06128302fc25c Mon Sep 17 00:00:00 2001 From: Johann Date: Thu, 25 Sep 2014 09:33:44 -0700 Subject: [PATCH] Fix build failure with Android NDK The version of gcc4.6 included with the Android NDK through r10b fails to compile this function. Replace it with C code. BUG=860 Change-Id: Ifcc0476664071aec46a171cdd5ad17305930986a --- vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c b/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c index d6b67f8..5ad9465 100644 --- a/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c +++ b/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c @@ -9,7 +9,17 @@ */ #include +#include "vpx_ports/arm.h" +#ifdef VPX_INCOMPATIBLE_GCC +#include "./vp8_rtcd.h" +void vp8_short_walsh4x4_neon( + int16_t *input, + int16_t *output, + int pitch) { + vp8_short_walsh4x4_c(input, output, pitch); +} +#else void vp8_short_walsh4x4_neon( int16_t *input, int16_t *output, @@ -116,3 +126,4 @@ void vp8_short_walsh4x4_neon( vst1q_s16(output + 8, q1s16); return; } +#endif // VPX_INCOMPATIBLE_GCC -- 2.7.4