diff --git a/README.chromium b/README.chromium index 4f2a79237..b7d3b99cf 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 365 +Version: 366 License: BSD License File: LICENSE diff --git a/include/libyuv/row.h b/include/libyuv/row.h index a3fdf53d3..ced0e3201 100644 --- a/include/libyuv/row.h +++ b/include/libyuv/row.h @@ -83,13 +83,13 @@ extern "C" { #define HAS_ARGBSHADE_SSE2 #define HAS_ARGBAFFINEROW_SSE2 #define HAS_ARGBINTERPOLATEROW_SSSE3 +#define HAS_NV12TOARGBROW_SSSE3 +#define HAS_NV21TOARGBROW_SSSE3 #endif // The following are Windows only: #if !defined(YUV_DISABLE_ASM) && defined(_M_IX86) #define HAS_ARGBCOLORTABLEROW_X86 -#define HAS_NV12TOARGBROW_SSSE3 -#define HAS_NV21TOARGBROW_SSSE3 #define HAS_I422TORGBAROW_SSSE3 #define HAS_RGBATOARGBROW_SSSE3 #define HAS_RGBATOUVROW_SSSE3 diff --git a/include/libyuv/version.h b/include/libyuv/version.h index c5b677fea..d6e2cb42e 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 365 +#define LIBYUV_VERSION 366 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_posix.cc b/source/row_posix.cc index 444065836..05173dd4a 100644 --- a/source/row_posix.cc +++ b/source/row_posix.cc @@ -1343,7 +1343,7 @@ struct { #define READNV12 \ "movq (%[uv_buf]),%%xmm0 \n" \ "lea 0x8(%[uv_buf]),%[uv_buf] \n" \ - "punpcklbw %%xmm1,%%xmm0 \n" \ + "punpcklwd %%xmm0,%%xmm0 \n" \ // Convert 8 pixels: 8 UV and 8 Y #define YUVTORGB \