From 88552486f1322b5d4da9ea7f833ac60998331f5d Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Fri, 20 Nov 2015 11:21:39 -0800 Subject: [PATCH] disable 411 on x86 due to compile error TBR=harryjin@google.com BUG=libyuv:524 Review URL: https://codereview.chromium.org/1468523002 . --- README.chromium | 2 +- include/libyuv/row.h | 2 +- include/libyuv/version.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index 0b95f2752..e115bcff5 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1544 +Version: 1545 License: BSD License File: LICENSE diff --git a/include/libyuv/row.h b/include/libyuv/row.h index 88faf5cb5..587e0f643 100644 --- a/include/libyuv/row.h +++ b/include/libyuv/row.h @@ -105,7 +105,7 @@ extern "C" { #define HAS_COPYROW_SSE2 #define HAS_H422TOARGBROW_SSSE3 #define HAS_I400TOARGBROW_SSE2 -#if !(defined(_DEBUG) && defined(__i386__)) +#if !defined(__i386__) // TODO(fbarchard): fix build error on x86 debug // https://code.google.com/p/libyuv/issues/detail?id=524 #define HAS_I411TOARGBROW_SSSE3 diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 80171e59e..430cbd43d 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 1544 +#define LIBYUV_VERSION 1545 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT