Merge commit 'e80307140f736f593ee643affa015333d7c5e27f'

[ffmpeg] / libavutil / arm / cpu.h

diff --git a/libavutil/arm/cpu.h b/libavutil/arm/cpu.h
index 27a2edacf59b53ae0bff31d83729fa862dd9d394..eb64ed5fcd1a32f75da5ed17893de9b77f3ba513 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 */