Scale fix for Neon

BUG=19
TEST=none
Review URL: https://webrtc-codereview.appspot.com/504002

git-svn-id: http://libyuv.googlecode.com/svn/trunk@247 16f28f9a-4ce2-e073-06de-1de4eb20be90

README.chromium

 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 246
+Version: 247
 License: BSD
 License File: LICENSE
 

include/libyuv/version.h

@@ -11,7 +11,7 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 246
+#define LIBYUV_VERSION 247
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_
 

source/rotate_neon.cc

@@ -174,12 +174,12 @@ void TransposeWx8_NEON(const uint8* src, int src_stride,
 
     "4:                                        \n"
 
-    : "+r"(src),              // %0
-      "+r"(src_stride),       // %1
-      "+r"(dst),              // %2
-      "+r"(dst_stride),       // %3
-      "+r"(width)             // %4
-    : "r"(&kVTbl4x4Transpose) // %5
+    : "+r"(src),               // %0
+      "+r"(src_stride),        // %1
+      "+r"(dst),               // %2
+      "+r"(dst_stride),        // %3
+      "+r"(width)              // %4
+    : "r"(&kVTbl4x4Transpose)  // %5
     : "memory", "cc", "r9", "q0", "q1", "q2", "q3"
   );
 }

source/scale.cc

@@ -493,12 +493,12 @@ static void ScaleRowDown38_2_Int_NEON(const uint8* src_ptr, int src_stride,
     "vst1.u32     {d4[0]}, [%1]!               \n"
     "subs         %2, #12                      \n"
     "bgt          1b                           \n"
-    : "+r"(src_ptr),          // %0
-      "+r"(dst_ptr),          // %1
-      "+r"(dst_width),        // %2
-      "+r"(src_stride)        // %3
-    : "r"(kMult38_Div6),       // %4
-      "r"(kShuf38_2)           // %5
+    : "+r"(src_ptr),       // %0
+      "+r"(dst_ptr),       // %1
+      "+r"(dst_width),     // %2
+      "+r"(src_stride)     // %3
+    : "r"(&kMult38_Div6),  // %4
+      "r"(&kShuf38_2)      // %5
     : "q0", "q1", "q2", "q3", "q13", "q14", "memory", "cc"
   );
 }