diff --git a/README.chromium b/README.chromium index 9b1a417c1..ca263b20c 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1321 +Version: 1324 License: BSD License File: LICENSE diff --git a/include/libyuv/planar_functions.h b/include/libyuv/planar_functions.h index d10a16985..e417dab39 100644 --- a/include/libyuv/planar_functions.h +++ b/include/libyuv/planar_functions.h @@ -388,7 +388,9 @@ int ARGBInterpolate(const uint8* src_argb0, int src_stride_argb0, int width, int height, int interpolation); #if defined(__pnacl__) || defined(__CLR_VER) || defined(COVERAGE_ENABLED) || \ - defined(TARGET_IPHONE_SIMULATOR) + defined(TARGET_IPHONE_SIMULATOR) || \ + (defined(__i386__) && !defined(__SSE2__)) || \ + (defined(_MSC_VER) && defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 3557bc6a9..698aab5a9 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 1321 +#define LIBYUV_VERSION 1324 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT