summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorashok.bhat@gmail.com <ashok.bhat@gmail.com>2014-09-29 09:40:37 +0000
committerashok.bhat@gmail.com <ashok.bhat@gmail.com>2014-09-29 09:40:37 +0000
commit824d9071d7577c649d9e30fa9b2fe71a8becbe4a (patch)
tree7ab036bcae36c637fcf981de6023119908e6938f
parenta7735b9ab33bdfce75fadbe80e425b85b512a9a3 (diff)
downloadlibyuv-824d9071d7577c649d9e30fa9b2fe71a8becbe4a.tar.gz
Remove __ARM_NEON__ define check for AArch64
BUG=319 TESTED=local build R=fbarchard@google.com Review URL: https://webrtc-codereview.appspot.com/28569005 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1095 16f28f9a-4ce2-e073-06de-1de4eb20be90
-rw-r--r--README.chromium2
-rw-r--r--include/libyuv/version.h2
-rw-r--r--source/rotate_neon64.cc3
-rw-r--r--source/row_neon64.cc3
4 files changed, 4 insertions, 6 deletions
diff --git a/README.chromium b/README.chromium
index 00d9c84..528babe 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
Name: libyuv
URL: http://code.google.com/p/libyuv/
-Version: 1093
+Version: 1095
License: BSD
License File: LICENSE
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 72b9f46..8ad4924 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
-#define LIBYUV_VERSION 1093
+#define LIBYUV_VERSION 1095
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
diff --git a/source/rotate_neon64.cc b/source/rotate_neon64.cc
index 0b336b8..d54378e 100644
--- a/source/rotate_neon64.cc
+++ b/source/rotate_neon64.cc
@@ -18,8 +18,7 @@ extern "C" {
#endif
// This module is for GCC Neon armv8 64 bit.
-#if !defined(LIBYUV_DISABLE_NEON) && \
- defined(__ARM_NEON__) && defined(__aarch64__)
+#if !defined(LIBYUV_DISABLE_NEON) && defined(__aarch64__)
static uvec8 kVTbl4x4Transpose =
{ 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15 };
diff --git a/source/row_neon64.cc b/source/row_neon64.cc
index 7a153e1..cbb2344 100644
--- a/source/row_neon64.cc
+++ b/source/row_neon64.cc
@@ -16,8 +16,7 @@ extern "C" {
#endif
// This module is for GCC Neon armv8 64 bit.
-#if !defined(LIBYUV_DISABLE_NEON) && \
- defined(__ARM_NEON__) && defined(__aarch64__)
+#if !defined(LIBYUV_DISABLE_NEON) && defined(__aarch64__)
// Read 8 Y, 4 U and 4 V from 422
#define READYUV422 \