diff --git a/README.chromium b/README.chromium index e76949316..12ca04735 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1551 +Version: 1552 License: BSD License File: LICENSE diff --git a/include/libyuv/row.h b/include/libyuv/row.h index cf96c0516..31de3e089 100644 --- a/include/libyuv/row.h +++ b/include/libyuv/row.h @@ -105,12 +105,12 @@ extern "C" { #define HAS_COPYROW_SSE2 #define HAS_H422TOARGBROW_SSSE3 #define HAS_I400TOARGBROW_SSE2 -#if !defined(__i386__) +// The following functions fail on gcc/clang 32 bit. +// caveat: clangcl uses row_win.cc which works. +#if !defined(__i386__) || !defined(DEBUG) || defined(_MSC_VER) // TODO(fbarchard): fix build error on x86 debug // https://code.google.com/p/libyuv/issues/detail?id=524 #define HAS_I411TOARGBROW_SSSE3 -#endif -#if !(defined(_DEBUG) && defined(__i386__)) // TODO(fbarchard): fix build error on android_full_debug=1 // https://code.google.com/p/libyuv/issues/detail?id=517 #define HAS_I422ALPHATOARGBROW_SSSE3 diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 93cbb7868..075c6ca32 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 1551 +#define LIBYUV_VERSION 1552 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT