Commit 587ff646 authored by Johann's avatar Johann Committed by Gerrit Code Review

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
parent d174f276
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment