Disable Neon multiply 2 images

BUG=177
TEST=android try bots
Review URL: https://webrtc-codereview.appspot.com/1101005

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

README.chromium

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

include/libyuv/row.h

@@ -224,14 +224,17 @@ extern "C" {
 #define HAS_ARGBMIRRORROW_NEON
 
 // Effects
-#define HAS_ARGBINTERPOLATEROW_NEON
-#define HAS_ARGBBLENDROW_NEON
+#define HAS_ARGBADDROW_NEON
 #define HAS_ARGBATTENUATEROW_NEON
-#define HAS_ARGBQUANTIZEROW_NEON
+#define HAS_ARGBBLENDROW_NEON
+#define HAS_ARGBCOLORMATRIXROW_NEON
 #define HAS_ARGBGRAYROW_NEON
+#define HAS_ARGBINTERPOLATEROW_NEON
+//#define HAS_ARGBMULTIPLYROW_NEON
+#define HAS_ARGBQUANTIZEROW_NEON
 #define HAS_ARGBSEPIAROW_NEON
 #define HAS_ARGBSHADEROW_NEON
-#define HAS_ARGBCOLORMATRIXROW_NEON
+#define HAS_ARGBSUBTRACTROW_NEON
 #endif
 
 // The following are available on Mips platforms

include/libyuv/version.h

@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 559
+#define LIBYUV_VERSION 560
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT

source/row_neon.cc

@@ -2502,6 +2502,8 @@ void ARGBColorMatrixRow_NEON(uint8* dst_argb, const int8* matrix_argb,
   );
 }
 
+// TODO(fbarchard): fix vqshrun in ARGBMultiplyRow_NEON and reenable.
+#ifdef HAS_ARGBMULTIPLYROW_NEON
 // Multiply 2 rows of ARGB pixels together, 8 pixels at a time.
 void ARGBMultiplyRow_NEON(const uint8* src_argb0, const uint8* src_argb1,
                           uint8* dst_argb, int width) {
@@ -2531,6 +2533,7 @@ void ARGBMultiplyRow_NEON(const uint8* src_argb0, const uint8* src_argb1,
   : "cc", "memory", "q0", "q1", "q2", "q3"
   );
 }
+#endif  // HAS_ARGBMULTIPLYROW_NEON
 
 // Add 2 rows of ARGB pixels together, 8 pixels at a time.
 void ARGBAddRow_NEON(const uint8* src_argb0, const uint8* src_argb1,