From cd52054ce87b6492616f48fef6e891c2a621a021 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Wed, 24 Jul 2013 11:19:56 +0000 Subject: [PATCH] Disable assembly for x64 nacl. BUG=253 TESTED=untested R=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1857004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@738 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/row.h | 3 ++- include/libyuv/version.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index 2b04ff848..d99032125 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 737 +Version: 738 License: BSD License File: LICENSE diff --git a/include/libyuv/row.h b/include/libyuv/row.h index a836e7ed2..d6fc637e8 100644 --- a/include/libyuv/row.h +++ b/include/libyuv/row.h @@ -27,7 +27,8 @@ extern "C" { #define IS_ALIGNED(p, a) (!((uintptr_t)(p) & ((a) - 1))) #if defined(__CLR_VER) || defined(COVERAGE_ENABLED) || \ - defined(TARGET_IPHONE_SIMULATOR) + defined(TARGET_IPHONE_SIMULATOR) || \ + defined(__native_client__) && defined(__x86_64__) #define LIBYUV_DISABLE_X86 #endif // True if compiling for SSSE3 as a requirement. diff --git a/include/libyuv/version.h b/include/libyuv/version.h index f08671b1a..a76b86dfb 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 737 +#define LIBYUV_VERSION 738 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT