aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2016-01-07 15:06:49 +0200
committerMartin Storsjö <martin@martin.st>2016-01-08 23:52:59 +0200
commit73c8c0341cce9e1a6c4169721f5123f97fc4be2f (patch)
tree36678de4542089e2f974bf0caec8af2483cf4bc8
parentfec76cd430f3c865183a6e5b4caec0743e055605 (diff)
downloadffmpeg-73c8c0341cce9e1a6c4169721f5123f97fc4be2f.tar.gz
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@martin.st>
-rw-r--r--libavutil/arm/cpu.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/arm/cpu.h b/libavutil/arm/cpu.h
index 5563fc1c69..127993e5dd 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