diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-06-07 12:10:22 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-06-07 12:10:22 -0700 |
| commit | 747f76fc999a0fc6cd38b5a5e5aee512302dacc7 (patch) | |
| tree | e2c72955e06d53a34ec3d1e5e21f6cb013eef06a | |
| parent | fd935f309c3a0129f1f2f213a4786a9e98976554 (diff) | |
| parent | 98ca829f574c281bc320c27dd2c71ac97b20734b (diff) | |
| download | libvpx-747f76fc999a0fc6cd38b5a5e5aee512302dacc7.tar libvpx-747f76fc999a0fc6cd38b5a5e5aee512302dacc7.tar.gz libvpx-747f76fc999a0fc6cd38b5a5e5aee512302dacc7.tar.bz2 libvpx-747f76fc999a0fc6cd38b5a5e5aee512302dacc7.zip | |
Merge "Fix mingw build error" into experimental
| -rw-r--r-- | third_party/libyuv/source/scale.c | 2 |
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. |