From 512bec91edaea60129d08c2d8053653b9fe51db4 Mon Sep 17 00:00:00 2001
From: "fbarchard@google.com"
 <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>
Date: Wed, 6 Feb 2013 05:46:15 +0000
Subject: [PATCH] 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          |  2 +-
 include/libyuv/row.h     | 11 +++++++----
 include/libyuv/version.h |  2 +-
 source/row_neon.cc       |  3 +++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/README.chromium b/README.chromium
index f2cd28473..a982c5d3b 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 559
+Version: 560
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/row.h b/include/libyuv/row.h
index 2665f60ec..d7f43e347 100644
--- a/include/libyuv/row.h
+++ b/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
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 6caebc290..22717672c 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 559
+#define LIBYUV_VERSION 560
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/row_neon.cc b/source/row_neon.cc
index 796a2c706..26068f4e7 100644
--- a/source/row_neon.cc
+++ b/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,