From 6eaee58589c1ec4937f914d122fda035e5b5b679 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Mon, 2 Mar 2015 18:48:17 +0000 Subject: [PATCH] shift by 16 for neon expects a number sign BUG=408 TESTED=nacl arm build R=harryjin@google.com Review URL: https://webrtc-codereview.appspot.com/38329004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1305 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/row_neon.cc | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.chromium b/README.chromium index d415c3f83..f582843e5 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1298 +Version: 1305 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 289dffed6..9236a7fa1 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 1298 +#define LIBYUV_VERSION 1305 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_neon.cc b/source/row_neon.cc index e77c7a0c4..8badc5a9b 100644 --- a/source/row_neon.cc +++ b/source/row_neon.cc @@ -112,9 +112,9 @@ extern "C" { "vqshrun.s32 d0, q0, #16 \n" \ "vqshrun.s32 d1, q10, #16 \n" /* Y */\ "vadd.s16 d18, d19 \n" \ - "vshll.u16 q1, d16, 16 \n" /* Replicate u * UB */\ - "vshll.u16 q10, d17, 16 \n" /* Replicate v * VR */\ - "vshll.u16 q3, d18, 16 \n" /* Replicate (v*VG + u*UG)*/\ + "vshll.u16 q1, d16, #16 \n" /* Replicate u * UB */\ + "vshll.u16 q10, d17, #16 \n" /* Replicate v * VR */\ + "vshll.u16 q3, d18, #16 \n" /* Replicate (v*VG + u*UG)*/\ "vaddw.u16 q1, q1, d16 \n" \ "vaddw.u16 q10, q10, d17 \n" \ "vaddw.u16 q3, q3, d18 \n" \