diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-28 21:31:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-28 21:31:18 +0200 |
| commit | 01983e50c0248a3794b345cc0df108752a7c21c8 (patch) | |
| tree | 04279fa742da99284f2b03ecec430fa9cb433f0b /libavutil/arm | |
| parent | e6aba1be4cb05c8bf56ddfb26e76ea3351237f58 (diff) | |
| parent | 7b0c7c9163fe3dd0081696befde28617119d2590 (diff) | |
| download | ffmpeg-01983e50c0248a3794b345cc0df108752a7c21c8.tar.gz | |
Merge commit '7b0c7c9163fe3dd0081696befde28617119d2590'
* commit '7b0c7c9163fe3dd0081696befde28617119d2590':
arm: Detect 32 bit cpu features on ARMv8 when running on a 64 bit kernel
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm')
| -rw-r--r-- | libavutil/arm/cpu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/arm/cpu.c b/libavutil/arm/cpu.c index 3f7674bfe8..f6cf338591 100644 --- a/libavutil/arm/cpu.c +++ b/libavutil/arm/cpu.c @@ -90,8 +90,10 @@ static int get_cpuinfo(uint32_t *hwcap) *hwcap |= HWCAP_VFP; if (strstr(buf, " vfpv3 ")) *hwcap |= HWCAP_VFPv3; - if (strstr(buf, " neon ")) + if (strstr(buf, " neon ") || strstr(buf, " asimd ")) *hwcap |= HWCAP_NEON; + if (strstr(buf, " fp ")) // Listed on 64 bit ARMv8 kernels + *hwcap |= HWCAP_VFP | HWCAP_VFPv3; break; } } |