Merge commit '73c8c0341cce9e1a6c4169721f5123f97fc4be2f'

* commit '73c8c0341cce9e1a6c4169721f5123f97fc4be2f':
  arm: Fix vfp dead code elimination with have_vfp_vm

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --git a/libavutil/arm/cpu.h b/libavutil/arm/cpu.h
index 27a2eda..eb64ed5 100644 (file)
--- a/libavutil/arm/cpu.h
+++ b/libavutil/arm/cpu.h
@@ -34,6 +34,6 @@
 /* some functions use the VFPv2 vector mode which is deprecated in ARMv7-A
  * and might trap on such CPU depending on the OS configuration */
 #define have_vfp_vm(flags)                                              \
-    (have_armv6(flags) && ((flags) & AV_CPU_FLAG_VFP_VM))
+    (HAVE_VFP && ((flags) & AV_CPU_FLAG_VFP_VM))
 
 #endif /* AVUTIL_ARM_CPU_H */