diff options
| author | James Zern <jzern@google.com> | 2014-09-06 10:25:19 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2014-09-06 10:39:49 -0700 |
| commit | fcd431fdc75cb6178adab234aeb5998359a76872 (patch) | |
| tree | f71d2cfe0900629b448e146f7b96ffb0b78eb1b4 /third_party | |
| parent | 89963bf586d818be20be21b27772af0768e15121 (diff) | |
| download | libvpx-fcd431fdc75cb6178adab234aeb5998359a76872.tar.gz | |
libyuv: cherry-pick MSVC arm build fix
Issue 24479004: Fix building with MSVC for arm
https://webrtc-codereview.appspot.com/24479004/
Change-Id: I758b33a21f46e46af6e58d83b7c045262ac9c7d9
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libyuv/README.libvpx | 2 | ||||
| -rw-r--r-- | third_party/libyuv/source/cpu_id.cc | 3 | ||||
| -rw-r--r-- | third_party/libyuv/source/row_win.cc | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/third_party/libyuv/README.libvpx b/third_party/libyuv/README.libvpx index fb2b9d162..3869d25bc 100644 --- a/third_party/libyuv/README.libvpx +++ b/third_party/libyuv/README.libvpx @@ -13,4 +13,4 @@ which down-samples the original input video (f.g. 1280x720) a number of times in order to encode multiple resolution bit streams. Local Modifications: -None. +cherry-pick 'Issue 24479004: Fix building with MSVC for arm' diff --git a/third_party/libyuv/source/cpu_id.cc b/third_party/libyuv/source/cpu_id.cc index deb4c4465..8f8a403ee 100644 --- a/third_party/libyuv/source/cpu_id.cc +++ b/third_party/libyuv/source/cpu_id.cc @@ -15,7 +15,8 @@ #endif #if !defined(__pnacl__) && !defined(__CLR_VER) && \ !defined(__native_client__) && \ - defined(_MSC_VER) && (_MSC_FULL_VER >= 160040219) + defined(_MSC_VER) && (_MSC_FULL_VER >= 160040219) && \ + (defined(_M_IX86) || defined(_M_X64)) #include <immintrin.h> // For _xgetbv() #endif diff --git a/third_party/libyuv/source/row_win.cc b/third_party/libyuv/source/row_win.cc index f58fc5138..d79c35396 100644 --- a/third_party/libyuv/source/row_win.cc +++ b/third_party/libyuv/source/row_win.cc @@ -21,7 +21,8 @@ extern "C" { #endif // This module is for Visual C. -#if !defined(LIBYUV_DISABLE_X86) && defined(_MSC_VER) +#if !defined(LIBYUV_DISABLE_X86) && defined(_MSC_VER) && \ + (defined(_M_IX86) || defined(_M_X64)) #define YG 74 /* (int8)(1.164 * 64 + 0.5) */ |