diff --git a/README.chromium b/README.chromium index 3aad45f01..3aa080bb9 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 695 +Version: 696 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index d55c98a5d..1481e4f1e 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 695 +#define LIBYUV_VERSION 696 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/scale.cc b/source/scale.cc index 909172236..7c11e5d07 100644 --- a/source/scale.cc +++ b/source/scale.cc @@ -12,7 +12,6 @@ #include #include -#include // For getenv() #include "libyuv/cpu_id.h" #include "libyuv/planar_functions.h" // For CopyPlane @@ -3313,13 +3312,6 @@ void ScalePlane(const uint8* src, int src_stride, uint8* dst, int dst_stride, int dst_width, int dst_height, FilterMode filtering) { -#ifdef CPU_X86 - // environment variable overrides for testing. - char* filter_override = getenv("LIBYUV_FILTER"); - if (filter_override) { - filtering = (FilterMode)atoi(filter_override); // NOLINT - } -#endif // Use specialized scales to improve performance for common resolutions. // For example, all the 1/2 scalings will use ScalePlaneDown2() if (dst_width == src_width && dst_height == src_height) { diff --git a/source/scale_argb.cc b/source/scale_argb.cc index 381325971..47e5a9013 100644 --- a/source/scale_argb.cc +++ b/source/scale_argb.cc @@ -12,7 +12,6 @@ #include #include -#include // For getenv() #include "libyuv/cpu_id.h" #include "libyuv/planar_functions.h" // For CopyARGB @@ -1109,13 +1108,6 @@ static void ScaleARGB(const uint8* src, int src_stride, dst += clip_y * dst_stride; } -#ifdef CPU_X86 - // Environment variable overrides for testing. - char* filter_override = getenv("LIBYUV_FILTER"); - if (filter_override) { - filtering = (FilterMode)atoi(filter_override); // NOLINT - } -#endif // Special case for integer step values. if (((dx | dy) & 0xffff) == 0) { // Optimized even scale down. ie 2, 4, 6, 8, 10x.