diff options
| author | Johann <johannkoenig@google.com> | 2015-03-02 15:19:19 -0800 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2015-03-02 15:19:31 -0800 |
| commit | 223bf29307a1981940dbc224a0b1279a187eca6c (patch) | |
| tree | 438d592b79c8f70ef5ea5c0c83cc1c02484c19d3 /third_party/libyuv/source/scale_neon.cc | |
| parent | 1790d45252efb29903baae3d1776bb24cee76558 (diff) | |
| download | libvpx-223bf29307a1981940dbc224a0b1279a187eca6c.tar libvpx-223bf29307a1981940dbc224a0b1279a187eca6c.tar.gz libvpx-223bf29307a1981940dbc224a0b1279a187eca6c.tar.bz2 libvpx-223bf29307a1981940dbc224a0b1279a187eca6c.zip | |
libyuv: update to r1305
MIPS build fixes
https://code.google.com/p/webm/issues/detail?id=957
Change-Id: I9d53900af36d783c369b5dff27a7479cb94fd16b
Diffstat (limited to 'third_party/libyuv/source/scale_neon.cc')
| -rw-r--r-- | third_party/libyuv/source/scale_neon.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/third_party/libyuv/source/scale_neon.cc b/third_party/libyuv/source/scale_neon.cc index 1b8a5ba58..7921219b5 100644 --- a/third_party/libyuv/source/scale_neon.cc +++ b/third_party/libyuv/source/scale_neon.cc @@ -16,7 +16,8 @@ extern "C" { #endif // This module is for GCC Neon. -#if !defined(LIBYUV_DISABLE_NEON) && defined(__ARM_NEON__) +#if !defined(LIBYUV_DISABLE_NEON) && defined(__ARM_NEON__) && \ + !defined(__aarch64__) // NEON downscalers with interpolation. // Provided by Fritz Koenig @@ -756,7 +757,7 @@ void ScaleARGBRowDownEvenBox_NEON(const uint8* src_argb, ptrdiff_t src_stride, ); } -#endif // __ARM_NEON__ +#endif // defined(__ARM_NEON__) && !defined(__aarch64__) #ifdef __cplusplus } // extern "C" |