From 8410d6e93c2e074881f1c7b7e4cdefd2e497d52e Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 20 Aug 2013 16:36:46 +0200 Subject: avutil: Refactor CPU extension availability macros --- libavutil/arm/cpu.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'libavutil/arm') diff --git a/libavutil/arm/cpu.h b/libavutil/arm/cpu.h index b45f30b1a1..52e839c32e 100644 --- a/libavutil/arm/cpu.h +++ b/libavutil/arm/cpu.h @@ -21,12 +21,13 @@ #include "config.h" #include "libavutil/cpu.h" +#include "libavutil/cpu_internal.h" -#define have_armv5te(flags) (HAVE_ARMV5TE && ((flags) & AV_CPU_FLAG_ARMV5TE)) -#define have_armv6(flags) (HAVE_ARMV6 && ((flags) & AV_CPU_FLAG_ARMV6)) -#define have_armv6t2(flags) (HAVE_ARMV6T2 && ((flags) & AV_CPU_FLAG_ARMV6T2)) -#define have_vfp(flags) (HAVE_VFP && ((flags) & AV_CPU_FLAG_VFP)) -#define have_vfpv3(flags) (HAVE_VFPV3 && ((flags) & AV_CPU_FLAG_VFPV3)) -#define have_neon(flags) (HAVE_NEON && ((flags) & AV_CPU_FLAG_NEON)) +#define have_armv5te(flags) CPUEXT(flags, ARMV5TE) +#define have_armv6(flags) CPUEXT(flags, ARMV6) +#define have_armv6t2(flags) CPUEXT(flags, ARMV6T2) +#define have_vfp(flags) CPUEXT(flags, VFP) +#define have_vfpv3(flags) CPUEXT(flags, VFPV3) +#define have_neon(flags) CPUEXT(flags, NEON) #endif /* AVUTIL_ARM_CPU_H */ -- cgit v1.2.3