From e2ea106068e779882d40772532bde3be0c0d2fa6 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Fri, 3 Apr 2015 23:28:44 +0000 Subject: [PATCH] shift for arm wants a # sign for nacl and ios. BUG=420 TESTED=d:/src/nacl_sdk/pepper_canary/toolchain/win_arm_newlib/bin/arm-nacl-g++ -o newlib/Release/source/scale_neon_arm.o -c source/scale_neon.cc -g -O2 -pthread -MMD -DNDEBUG -Id:/src/nacl_sdk/pepper_canary/include -Id:/src/nacl_sdk/pepper_canary/include/newlib -I./include R=tpsiaki@google.com Review URL: https://webrtc-codereview.appspot.com/47949004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1356 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/scale_neon.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index 3c960d867..b109b2010 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1354 +Version: 1356 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 135baead6..cdc740472 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 1354 +#define LIBYUV_VERSION 1356 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/scale_neon.cc b/source/scale_neon.cc index 4386910f6..cfbb4756a 100644 --- a/source/scale_neon.cc +++ b/source/scale_neon.cc @@ -920,7 +920,7 @@ void ScaleARGBRowDownEvenBox_NEON(const uint8* src_argb, ptrdiff_t src_stride, // the x/dx stepping #define LOAD1_DATA32_LANE(dn, n) \ "lsr %5, %3, #16 \n" \ - "add %6, %1, %5, lsl 2 \n" \ + "add %6, %1, %5, lsl #2 \n" \ "add %3, %3, %4 \n" \ MEMACCESS(6) \ "vld1.32 {"#dn"["#n"]}, [%6] \n"