summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfbarchard@google.com <fbarchard@google.com>2014-10-02 20:55:22 +0000
committerfbarchard@google.com <fbarchard@google.com>2014-10-02 20:55:22 +0000
commit0c603fbca341b1260fa4636a2d102419aab5ac41 (patch)
tree079da4eb4c30767558a29c2c00b815c3326c096d
parent69966593d6d4d5eb5cfa3b1d9ef4a2b751a09191 (diff)
downloadlibyuv-0c603fbca341b1260fa4636a2d102419aab5ac41.tar.gz
Move AVX code to conditionals used for AVX2 to require newer compiler.
BUG=367 TESTED=try bots R=harryjin@google.com Review URL: https://webrtc-codereview.appspot.com/24819004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1105 16f28f9a-4ce2-e073-06de-1de4eb20be90
-rw-r--r--README.chromium2
-rw-r--r--include/libyuv/row.h2
-rw-r--r--include/libyuv/version.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/README.chromium b/README.chromium
index 25c0026..cff56a3 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
Name: libyuv
URL: http://code.google.com/p/libyuv/
-Version: 1104
+Version: 1105
License: BSD
License File: LICENSE
diff --git a/include/libyuv/row.h b/include/libyuv/row.h
index a2c492f..dd83afa 100644
--- a/include/libyuv/row.h
+++ b/include/libyuv/row.h
@@ -122,7 +122,6 @@ extern "C" {
#define HAS_BGRATOUVROW_SSSE3
#define HAS_BGRATOYROW_SSSE3
#define HAS_COPYROW_ERMS
-#define HAS_COPYROW_AVX
#define HAS_COPYROW_SSE2
#define HAS_COPYROW_X86
#define HAS_HALFROW_SSE2
@@ -200,6 +199,7 @@ extern "C" {
#if !defined(LIBYUV_DISABLE_X86) && (defined(VISUALC_HAS_AVX2) || \
defined(CLANG_HAS_AVX2) || defined(GCC_HAS_AVX2))
// Effects:
+#define HAS_COPYROW_AVX
#define HAS_ARGBPOLYNOMIALROW_AVX2
#define HAS_ARGBSHUFFLEROW_AVX2
#define HAS_ARGBCOPYALPHAROW_AVX2
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index dbc13fa..8a89025 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 1104
+#define LIBYUV_VERSION 1105
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT