From fc2adcfa4287c0017f6966b21286c7bc4e614ffb Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Tue, 9 Feb 2016 10:51:20 -0800 Subject: [PATCH] fix for msan builds which set -DLIBYUV_DISABLE_X86=1 TBR=harryjin@google.com BUG=libyuv:566 Review URL: https://codereview.chromium.org/1673313003 . --- README.chromium | 2 +- include/libyuv/compare_row.h | 3 ++- include/libyuv/version.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index 9d4308e22..b69caf2e2 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1572 +Version: 1573 License: BSD License File: LICENSE diff --git a/include/libyuv/compare_row.h b/include/libyuv/compare_row.h index 4562da047..f5836da11 100644 --- a/include/libyuv/compare_row.h +++ b/include/libyuv/compare_row.h @@ -36,7 +36,8 @@ extern "C" { #endif // clang >= 3.4 #endif // __clang__ -#if defined(_M_IX86) && (defined(VISUALC_HAS_AVX2) || defined(CLANG_HAS_AVX2)) +#if !defined(LIBYUV_DISABLE_X86) && \ + defined(_M_IX86) && (defined(VISUALC_HAS_AVX2) || defined(CLANG_HAS_AVX2)) #define HAS_HASHDJB2_AVX2 #endif diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 24343734c..973311114 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 1572 +#define LIBYUV_VERSION 1573 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT