diff --git a/README.chromium b/README.chromium index 60eecfec4..c1c7e599e 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 301 +Version: 302 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index e47fa36a9..3d6f6b2fa 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 300 +#define LIBYUV_VERSION 302 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/scale.cc b/source/scale.cc index fb3bfc635..cb6fe2170 100644 --- a/source/scale.cc +++ b/source/scale.cc @@ -23,6 +23,9 @@ namespace libyuv { extern "C" { #endif +// Bilinear SSE2 is disabled. +#define SSE2_DISABLED 1 + // Note: Some SSE2 reference manuals // cpuvol1.pdf agner_instruction_tables.pdf 253666.pdf 253667.pdf @@ -31,7 +34,6 @@ extern "C" { // NOT the optimized versions. Useful for debugging and // when comparing the quality of the resulting YUV planes // as produced by the optimized and non-optimized versions. -#define SSE2_DISABLED 1 static bool use_reference_impl_ = false; void SetUseReferenceImpl(bool use) { diff --git a/source/scale_argb.cc b/source/scale_argb.cc index 8bc140c5e..dcb73c81b 100644 --- a/source/scale_argb.cc +++ b/source/scale_argb.cc @@ -23,12 +23,13 @@ namespace libyuv { extern "C" { #endif -// ARGB scaling uses bilinear or point, but not box filter. +// Bilinear SSE2 is disabled. +#define SSE2_DISABLED 1 +// ARGB scaling uses bilinear or point, but not box filter. /** * SSE2 downscalers with bilinear interpolation. */ -#define SSE2_DISABLED 1 #if !defined(YUV_DISABLE_ASM) && defined(_M_IX86)