From a5d26cedb1fc7e9ee41f781f72b175e15ae23ff8 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Wed, 25 Feb 2015 19:28:45 +0000 Subject: [PATCH] if building with gcc and sse2 is not enabled, disable assembly BUG=none TESTED=nacl build with default options R=harryjin@google.com Review URL: https://webrtc-codereview.appspot.com/44389004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1298 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 aaede9187..d415c3f83 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1296 +Version: 1298 License: BSD License File: LICENSE diff --git a/include/libyuv/row.h b/include/libyuv/row.h index ac4d5c724..4592c16a1 100644 --- a/include/libyuv/row.h +++ b/include/libyuv/row.h @@ -39,6 +39,7 @@ extern "C" { #if defined(__pnacl__) || defined(__CLR_VER) || defined(COVERAGE_ENABLED) || \ defined(TARGET_IPHONE_SIMULATOR) || \ + (defined(__i386__) && !defined(__SSE2__)) || \ (defined(_MSC_VER) && defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif @@ -189,6 +190,7 @@ extern "C" { #define HAS_I422TORGBAROW_AVX2 #define HAS_NV12TOARGBROW_AVX2 #define HAS_NV21TOARGBROW_AVX2 +#define HAS_ARGBTOARGB4444ROW_AVX2 #endif // The following are available on all x86 platforms, but @@ -216,7 +218,6 @@ extern "C" { #define HAS_YUY2TOUV422ROW_AVX2 #define HAS_YUY2TOUVROW_AVX2 #define HAS_YUY2TOYROW_AVX2 -#define HAS_ARGBTOARGB4444ROW_AVX2 // The following require HAS_I422TOARGBROW_AVX2 #if defined(HAS_I422TOARGBROW_AVX2) diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 7efd2c3c9..289dffed6 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 1296 +#define LIBYUV_VERSION 1298 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT