зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1038492 - Cherry-pick libyuv's fix for clang-cl compatibility; r=jesup
This imports the following upstream change: https://code.google.com/p/libyuv/source/detail?r=1033
This commit is contained in:
Родитель
fcb0980556
Коммит
3bf8c34d1f
|
@ -38,7 +38,8 @@ extern "C" {
|
|||
var = 0
|
||||
|
||||
#if defined(__pnacl__) || defined(__CLR_VER) || defined(COVERAGE_ENABLED) || \
|
||||
defined(TARGET_IPHONE_SIMULATOR)
|
||||
defined(TARGET_IPHONE_SIMULATOR) || \
|
||||
(defined(_MSC_VER) && defined(__clang__))
|
||||
#define LIBYUV_DISABLE_X86
|
||||
#endif
|
||||
// True if compiling for SSSE3 as a requirement.
|
||||
|
|
|
@ -115,7 +115,7 @@ enum FourCC {
|
|||
FOURCC_H264 = FOURCC('H', '2', '6', '4'),
|
||||
|
||||
// Match any fourcc.
|
||||
FOURCC_ANY = 0xFFFFFFFF,
|
||||
FOURCC_ANY = -1,
|
||||
};
|
||||
|
||||
enum FourCCBpp {
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
#include "libyuv/cpu_id.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#if defined(_MSC_VER) && !defined(__clang__)
|
||||
#include <intrin.h> // For __cpuidex()
|
||||
#endif
|
||||
#if !defined(__pnacl__) && !defined(__CLR_VER) && \
|
||||
|
@ -48,7 +48,7 @@ extern "C" {
|
|||
defined(__i386__) || defined(__x86_64__))
|
||||
LIBYUV_API
|
||||
void CpuId(uint32 info_eax, uint32 info_ecx, uint32* cpu_info) {
|
||||
#if defined(_MSC_VER)
|
||||
#if defined(_MSC_VER) && !defined(__clang__)
|
||||
#if (_MSC_FULL_VER >= 160040219)
|
||||
__cpuidex((int*)(cpu_info), info_eax, info_ecx);
|
||||
#elif defined(_M_IX86)
|
||||
|
|
Загрузка…
Ссылка в новой задаче