From 7cd7f5a80fa7d63cdd0ca3b7e11447b8e6a1e7ec Mon Sep 17 00:00:00 2001
From: Frank Barchard <fbarchard@google.com>
Date: Fri, 31 Jul 2015 17:17:14 -0700
Subject: [PATCH] avx ifdef for scale HAS_SCALEADDROW_AVX2.

R=jzern@google.com
BUG=libyuv:480

Review URL: https://webrtc-codereview.appspot.com/53779004.
---
 README.chromium          | 2 +-
 include/libyuv/version.h | 2 +-
 source/scale_win.cc      | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.chromium b/README.chromium
index 95a2f75db..b0de6f9bf 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1455
+Version: 1456
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 4bf3f8c38..9d1d746c2 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 1455
+#define LIBYUV_VERSION 1456
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/scale_win.cc b/source/scale_win.cc
index 102f33edb..c3896ebad 100644
--- a/source/scale_win.cc
+++ b/source/scale_win.cc
@@ -826,6 +826,7 @@ void ScaleAddRow_SSE2(const uint8* src_ptr, uint16* dst_ptr, int src_width) {
   }
 }
 
+#ifdef HAS_SCALEADDROW_AVX2
 // Reads 32 bytes and accumulates to 32 shorts at a time.
 __declspec(naked)
 void ScaleAddRow_AVX2(const uint8* src_ptr, uint16* dst_ptr, int src_width) {
@@ -854,6 +855,7 @@ void ScaleAddRow_AVX2(const uint8* src_ptr, uint16* dst_ptr, int src_width) {
     ret
   }
 }
+#endif  // HAS_SCALEADDROW_AVX2
 
 // Bilinear column filtering. SSSE3 version.
 __declspec(naked)