diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 14:14:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 14:15:10 +0200 |
| commit | 2a60666d1d94cb907060b83a182cb5302a1add4b (patch) | |
| tree | 3db254289f72a71a1b2fd6683982a0962a1e33ad /libavutil/arm | |
| parent | c83d794936b2adacbdd7fee12cf14439a9ed2689 (diff) | |
| parent | 8410d6e93c2e074881f1c7b7e4cdefd2e497d52e (diff) | |
| download | ffmpeg-2a60666d1d94cb907060b83a182cb5302a1add4b.tar.gz | |
Merge commit '8410d6e93c2e074881f1c7b7e4cdefd2e497d52e'
* commit '8410d6e93c2e074881f1c7b7e4cdefd2e497d52e':
avutil: Refactor CPU extension availability macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm')
| -rw-r--r-- | libavutil/arm/cpu.h | 13 |
1 files changed, 7 insertions, 6 deletions
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 */ |