| 1 | diff -u -r ../libvpx-1.4.0/vpx_ports/arm_cpudetect.c ./vpx_ports/arm_cpudetect.c |
| 2 | --- ../libvpx-1.4.0/vpx_ports/arm_cpudetect.c 2015-04-03 14:49:19.000000000 -0400 |
| 3 | +++ ./vpx_ports/arm_cpudetect.c 2015-05-24 17:56:35.882394966 -0400 |
| 4 | @@ -101,23 +101,19 @@ |
| 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 | |
| 20 | #if HAVE_MEDIA |
| 21 | flags |= HAS_MEDIA; |
| 22 | #endif /* HAVE_MEDIA */ |
| 23 | #if HAVE_NEON || HAVE_NEON_ASM |
| 24 | - if (features & ANDROID_CPU_ARM_FEATURE_NEON) |
| 25 | flags |= HAS_NEON; |
| 26 | #endif /* HAVE_NEON || HAVE_NEON_ASM */ |
| 27 | return flags & mask; |