diff --git a/README.chromium b/README.chromium index 1cd2f83cb..ae76f3504 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 977 +Version: 978 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index e19fa79bb..18cea5612 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 977 +#define LIBYUV_VERSION 978 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_common.cc b/source/row_common.cc index 87d877adc..135bdc908 100644 --- a/source/row_common.cc +++ b/source/row_common.cc @@ -2024,7 +2024,7 @@ void I422ToUYVYRow_C(const uint8* src_y, #if !defined(LIBYUV_DISABLE_X86) && defined(HAS_I422TOARGBROW_SSSE3) // row_win.cc has asm version, but GCC uses 2 step wrapper. -#if defined(__x86_64__) || defined(__i386__) +#if !defined(_MSC_VER) && (defined(__x86_64__) || defined(__i386__)) void I422ToRGB565Row_SSSE3(const uint8* src_y, const uint8* src_u, const uint8* src_v, @@ -2036,7 +2036,7 @@ void I422ToRGB565Row_SSSE3(const uint8* src_y, ARGBToRGB565Row_SSE2(row, rgb_buf, width); free_aligned_buffer_64(row); } -#endif // defined(__x86_64__) || defined(__i386__) +#endif // !defined(_MSC_VER) && (defined(__x86_64__) || defined(__i386__)) #if defined(_M_IX86) || defined(__x86_64__) || defined(__i386__) void I422ToARGB1555Row_SSSE3(const uint8* src_y,