From 0c603fbca341b1260fa4636a2d102419aab5ac41 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Thu, 2 Oct 2014 20:55:22 +0000 Subject: [PATCH] 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 --- README.chromium | 2 +- include/libyuv/row.h | 2 +- include/libyuv/version.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index 25c0026f4..cff56a3ca 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 a2c492f36..dd83afa44 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 dbc13fa48..8a8902555 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