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>

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;
         }
     }