diff --git a/README.chromium b/README.chromium index 9674107c7..6310696cd 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1434 +Version: 1435 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 72e174567..01d29e1f3 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 1434 +#define LIBYUV_VERSION 1435 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_any.cc b/source/row_any.cc index 092f7891e..e7e87dd7b 100644 --- a/source/row_any.cc +++ b/source/row_any.cc @@ -403,13 +403,16 @@ ANY11(ARGBAttenuateRow_Any_NEON, ARGBAttenuateRow_NEON, 0, 4, 4, 7) #define ANY11P(NAMEANY, ARGBTOY_SIMD, ARGBTOY_C, T, SBPP, BPP, MASK) \ void NAMEANY(const uint8* src_argb, uint8* dst_argb, \ T shuffler, int width) { \ + SIMD_ALIGNED(uint8 temp[64 * 2]); \ + memset(temp, 0, 64); /* for YUY2 and msan */ \ int r = width & MASK; \ int n = width & ~MASK; \ if (n > 0) { \ ARGBTOY_SIMD(src_argb, dst_argb, shuffler, n); \ } \ - ARGBTOY_C(src_argb + n * SBPP, \ - dst_argb + n * BPP, shuffler, r); \ + memcpy(temp, src_argb + n * SBPP, r * SBPP); \ + ARGBTOY_SIMD(temp, temp + 64, shuffler, MASK + 1); \ + memcpy(dst_argb + n * BPP, temp + 64, r * BPP); \ } #if defined(HAS_ARGBTORGB565DITHERROW_SSE2)