diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 02:15:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 02:15:18 +0200 |
| commit | 4c57c6a7655fb3c1a7194c6f92a075c463d1b898 (patch) | |
| tree | e86d0f975f4c9e7e4a607ec2b8e751e37636f688 /libavutil/aarch64 | |
| parent | 541bebd41401d0bc3a2430541faebd55cc021149 (diff) | |
| parent | 8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14 (diff) | |
| download | ffmpeg-4c57c6a7655fb3c1a7194c6f92a075c463d1b898.tar.gz | |
Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'
* commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14':
aarch64: add armv8 CPU flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/aarch64')
| -rw-r--r-- | libavutil/aarch64/cpu.c | 5 | ||||
| -rw-r--r-- | libavutil/aarch64/cpu.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libavutil/aarch64/cpu.c b/libavutil/aarch64/cpu.c index 87e9d50561..8ef077aaea 100644 --- a/libavutil/aarch64/cpu.c +++ b/libavutil/aarch64/cpu.c @@ -22,6 +22,7 @@ int ff_get_cpu_flags_aarch64(void) { - return AV_CPU_FLAG_NEON * HAVE_NEON | - AV_CPU_FLAG_VFP * HAVE_VFP; + return AV_CPU_FLAG_ARMV8 * HAVE_ARMV8 | + AV_CPU_FLAG_NEON * HAVE_NEON | + AV_CPU_FLAG_VFP * HAVE_VFP; } diff --git a/libavutil/aarch64/cpu.h b/libavutil/aarch64/cpu.h index d6af28126b..cf1b9cc516 100644 --- a/libavutil/aarch64/cpu.h +++ b/libavutil/aarch64/cpu.h @@ -23,6 +23,7 @@ #include "libavutil/cpu.h" #include "libavutil/cpu_internal.h" +#define have_armv8(flags) CPUEXT(flags, ARMV8) #define have_neon(flags) CPUEXT(flags, NEON) #define have_vfp(flags) CPUEXT(flags, VFP) |