summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2013-06-04 13:08:54 -0700
committerJohn Koleszar <jkoleszar@google.com>2013-06-04 13:08:54 -0700
commit98ca829f574c281bc320c27dd2c71ac97b20734b (patch)
tree6b70d358607615148c67d4ca9279cdae43c8166c
parent6ad061de58b88b157fa0b83eb06405c52071f1ec (diff)
downloadlibvpx-98ca829f574c281bc320c27dd2c71ac97b20734b.tar
libvpx-98ca829f574c281bc320c27dd2c71ac97b20734b.tar.gz
libvpx-98ca829f574c281bc320c27dd2c71ac97b20734b.tar.bz2
libvpx-98ca829f574c281bc320c27dd2c71ac97b20734b.zip
Fix mingw build error
Fixes an issue where newer versions of GCC would try to compile the visual studio inline assembly. Fixes issue #571 Change-Id: I8e4500a9277447fdab0b55e5efa1f24ca97bdc03
-rw-r--r--third_party/libyuv/source/scale.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/libyuv/source/scale.c b/third_party/libyuv/source/scale.c
index c142a17bb..72a817d25 100644
--- a/third_party/libyuv/source/scale.c
+++ b/third_party/libyuv/source/scale.c
@@ -632,7 +632,7 @@ TALIGN16(const uint16, scaleab2[8]) =
{ 65536 / 3, 65536 / 3, 65536 / 2, 65536 / 3, 65536 / 3, 65536 / 2, 0, 0 };
#endif
-#if defined(_M_IX86) && !defined(YUV_DISABLE_ASM)
+#if defined(_M_IX86) && !defined(YUV_DISABLE_ASM) && defined(_MSC_VER)
#define HAS_SCALEROWDOWN2_SSE2
// Reads 32 pixels, throws half away and writes 16 pixels.