[FFmpeg-cvslog] arm: Fix vfp dead code elimination with have_vfp_vm

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu Jan  7 15:06:49 2016 +0200| [73c8c0341cce9e1a6c4169721f5123f97fc4be2f] | committer: Martin Storsjö

arm: Fix vfp dead code elimination with have_vfp_vm

This fixes builds with --disable-vfp.

Checking for the armv6 cpu flag is incorrect, since vfpv2 isn't
armv6 specific.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73c8c0341cce9e1a6c4169721f5123f97fc4be2f
---

 libavutil/arm/cpu.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/arm/cpu.h b/libavutil/arm/cpu.h
index 5563fc1..127993e 100644
--- a/libavutil/arm/cpu.h
+++ b/libavutil/arm/cpu.h
@@ -33,7 +33,7 @@
 /* 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))
 
 /* Some functions use the 'setend' instruction which is deprecated on ARMv8
  * and serializing on some ARMv7 cores. This macro ensures such functions