diff --git a/README.chromium b/README.chromium index 10e3e02c5..e84126aa0 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1357 +Version: 1362 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index c4717b8d4..7675e104f 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 1357 +#define LIBYUV_VERSION 1362 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_win.cc b/source/row_win.cc index 4531f9e5b..2d09a3f77 100644 --- a/source/row_win.cc +++ b/source/row_win.cc @@ -567,11 +567,11 @@ void RGB565ToARGBRow_AVX2(const uint8* src_rgb565, uint8* dst_argb, lea eax, [eax + 32] sub ecx, 16 jg convertloop - ret vzeroupper + ret } } -#endif HAS_RGB565TOARGBROW_AVX2 +#endif // HAS_RGB565TOARGBROW_AVX2 // 24 instructions __declspec(naked) __declspec(align(16)) @@ -2085,6 +2085,7 @@ void NV12ToARGBRow_AVX2(const uint8* y_buf, jg convertloop pop esi + vzeroupper ret } } @@ -2115,6 +2116,7 @@ void NV21ToARGBRow_AVX2(const uint8* y_buf, jg convertloop pop esi + vzeroupper ret } }