diff options
| author | Johann <johannkoenig@google.com> | 2014-09-25 09:33:44 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-09-25 12:15:21 -0700 |
| commit | 587ff646f69975bd1f589eeac3c06128302fc25c (patch) | |
| tree | 2f8857dafbfcf833f5b5b7757ca66b8573f766cc /vp8 | |
| parent | d174f2769e7dce00fdab2caa022db2f81c88d452 (diff) | |
| download | libvpx-587ff646f69975bd1f589eeac3c06128302fc25c.tar.gz | |
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
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c b/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c index d6b67f895..5ad946500 100644 --- a/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c +++ b/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c @@ -9,7 +9,17 @@ */ #include <arm_neon.h> +#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 |