From 619ee4586bfec5a79741fb1f886fbbcd8cad0d8a Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Fri, 17 Aug 2012 21:07:22 +0000 Subject: [PATCH] YUV_DISABLE_ASM for NEON BUG=70 TEST=none Review URL: https://webrtc-codereview.appspot.com/710013 git-svn-id: http://libyuv.googlecode.com/svn/trunk@324 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/rotate.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.chromium b/README.chromium index 8709aaee4..d4a9cd743 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 323 +Version: 324 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 7e1cb6ce4..ff0ff5b44 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 323 +#define LIBYUV_VERSION 324 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/rotate.cc b/source/rotate.cc index 330fd99f1..047e1f4e9 100644 --- a/source/rotate.cc +++ b/source/rotate.cc @@ -42,7 +42,7 @@ extern "C" { #endif #endif -#ifdef __ARM_NEON__ +#if !defined(YUV_DISABLE_ASM) && defined(__ARM_NEON__) #define HAS_MIRRORROW_NEON void MirrorRow_NEON(const uint8* src, uint8* dst, int width); #define HAS_MIRRORROW_UV_NEON @@ -57,7 +57,7 @@ void TransposeUVWx8_NEON(const uint8* src, int src_stride, uint8* dst_a, int dst_stride_a, uint8* dst_b, int dst_stride_b, int width); -#endif +#endif // defined(__ARM_NEON__) #if !defined(YUV_DISABLE_ASM) && defined(_M_IX86) #define HAS_TRANSPOSE_WX8_SSSE3