From fc34ac5bb2b795d11027384a83f3e2f72b833bdc Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Mon, 19 Aug 2013 22:29:33 +0000 Subject: [PATCH] Fix for ARGBScale nacl validator BUG=253 TESTED=ncval.exe newlib/Release/nacltest_x86_64.nexe R=nfullagar@google.com Review URL: https://webrtc-codereview.appspot.com/2066004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@767 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/scale_argb.cc | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.chromium b/README.chromium index 511261fe2..130cd92aa 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 766 +Version: 767 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 74163731b..4eb75af06 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 766 +#define LIBYUV_VERSION 767 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/scale_argb.cc b/source/scale_argb.cc index 150630e35..2a15076d2 100644 --- a/source/scale_argb.cc +++ b/source/scale_argb.cc @@ -513,6 +513,7 @@ static void ScaleARGBRowDownEvenBox_SSE2(const uint8* src_argb, "movq "MEMACCESS(0)",%%xmm0 \n" MEMOPREG(movhps,0x00,0,1,1,xmm0) // movhps (%0,%1,1),%%xmm0 MEMOPREG(movq,0x00,0,1,2,xmm1) // movq (%0,%1,2),%%xmm1 + BUNDLEALIGN MEMOPREG(movhps,0x00,0,4,1,xmm1) // movhps (%0,%4,1),%%xmm1 "lea "MEMLEA4(0x00,0,1,4)",%0 \n" "movq "MEMACCESS(5)",%%xmm2 \n"