diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-26 03:01:00 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-26 03:01:00 +0200 |
commit | aa332026488e8e441a4187898534c59cd657e70e (patch) | |
tree | 1eb1efac80b21a2889c7ea03ead5e203c2ee85c6 /src/3rdparty/libwebp/src/dsp/cpu.c | |
parent | c6e1c8f3a8e0d0153ff82da88593edb9b7bf8995 (diff) | |
parent | 62082a63e112e9991b33c2045896ced78ffcb62e (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I06492f609fbb58d78738fff6d124b616287b03bd
Diffstat (limited to 'src/3rdparty/libwebp/src/dsp/cpu.c')
-rw-r--r-- | src/3rdparty/libwebp/src/dsp/cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/libwebp/src/dsp/cpu.c b/src/3rdparty/libwebp/src/dsp/cpu.c index 6f42cbb..8b40fee 100644 --- a/src/3rdparty/libwebp/src/dsp/cpu.c +++ b/src/3rdparty/libwebp/src/dsp/cpu.c @@ -18,7 +18,7 @@ #include <string.h> #endif -#if defined(WEBP_ANDROID_NEON) && !defined(Q_OS_ANDROID_EMBEDDED) +#if defined(WEBP_ANDROID_NEON) #include <cpu-features.h> #endif @@ -168,7 +168,7 @@ static int x86CPUInfo(CPUFeature feature) { return 0; } VP8CPUInfo VP8GetCPUInfo = x86CPUInfo; -#elif defined(WEBP_ANDROID_NEON) && !defined(Q_OS_ANDROID_EMBEDDED) // NB: needs to be before generic NEON test. +#elif defined(WEBP_ANDROID_NEON) // NB: needs to be before generic NEON test. static int AndroidCPUInfo(CPUFeature feature) { const AndroidCpuFamily cpu_family = android_getCpuFamily(); const uint64_t cpu_features = android_getCpuFeatures(); |