summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfbarchard@google.com <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>2014-04-25 22:07:01 +0000
committerfbarchard@google.com <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>2014-04-25 22:07:01 +0000
commitb846eb4f6e171e6285caa7c83186db4ec94d624d (patch)
treebb8ade1ca0b4ab79c00a55c8005618e92a026d78
parent05c4c715090dd1ffdd3b9bbc52cc078e6398ac3a (diff)
downloadlibyuv-b846eb4f6e171e6285caa7c83186db4ec94d624d.tar.gz
Color Matrix on Arm use C version. Unittest is failing on iphone5s, so disable Neon for until investigated.
BUG=326 TESTED=untested R=thorcarpenter@google.com Review URL: https://webrtc-codereview.appspot.com/20369005 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1003 16f28f9a-4ce2-e073-06de-1de4eb20be90
-rw-r--r--README.chromium2
-rw-r--r--include/libyuv/row.h3
-rw-r--r--include/libyuv/version.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/README.chromium b/README.chromium
index d0363f5..d1eae11 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
Name: libyuv
URL: http://code.google.com/p/libyuv/
-Version: 1000
+Version: 1003
License: BSD
License File: LICENSE
diff --git a/include/libyuv/row.h b/include/libyuv/row.h
index 757020d..356f87c 100644
--- a/include/libyuv/row.h
+++ b/include/libyuv/row.h
@@ -312,7 +312,6 @@ extern "C" {
#define HAS_ARGBADDROW_NEON
#define HAS_ARGBATTENUATEROW_NEON
#define HAS_ARGBBLENDROW_NEON
-#define HAS_ARGBCOLORMATRIXROW_NEON
#define HAS_ARGBGRAYROW_NEON
#define HAS_ARGBMIRRORROW_NEON
#define HAS_ARGBMULTIPLYROW_NEON
@@ -326,6 +325,8 @@ extern "C" {
#define HAS_SOBELXROW_NEON
#define HAS_SOBELYROW_NEON
#define HAS_INTERPOLATEROW_NEON
+// TODO(fbarchard): Investigate neon unittest failure.
+// #define HAS_ARGBCOLORMATRIXROW_NEON
#endif
// The following are available on Mips platforms:
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index a61c45f..ce8fb14 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 1000
+#define LIBYUV_VERSION 1003
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT