Commit | Line | Data |
---|---|---|
4f081a78 FF |
1 | diff -u -r ../libvpx-1.6.1/vpx_ports/arm_cpudetect.c ./vpx_ports/arm_cpudetect.c |
2 | --- ../libvpx-1.6.1/vpx_ports/arm_cpudetect.c 2017-01-12 21:27:27.000000000 +0100 | |
3 | +++ ./vpx_ports/arm_cpudetect.c 2017-01-29 23:55:05.399283897 +0100 | |
4 | @@ -92,20 +92,17 @@ | |
59f0d218 FF |
5 | } |
6 | ||
7 | #elif defined(__ANDROID__) /* end _MSC_VER */ | |
8 | -#include <cpu-features.h> | |
9 | ||
10 | int arm_cpu_caps(void) { | |
11 | int flags; | |
12 | int mask; | |
13 | - uint64_t features; | |
14 | if (!arm_cpu_env_flags(&flags)) { | |
15 | return flags; | |
16 | } | |
17 | mask = arm_cpu_env_mask(); | |
18 | - features = android_getCpuFeatures(); | |
19 | ||
59f0d218 | 20 | #if HAVE_NEON || HAVE_NEON_ASM |
4f081a78 FF |
21 | - if (features & ANDROID_CPU_ARM_FEATURE_NEON) flags |= HAS_NEON; |
22 | + flags |= HAS_NEON; | |
59f0d218 FF |
23 | #endif /* HAVE_NEON || HAVE_NEON_ASM */ |
24 | return flags & mask; | |
4f081a78 | 25 | } |