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/cpu.c | |
| 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/cpu.c')
| -rw-r--r-- | libavutil/cpu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/cpu.c b/libavutil/cpu.c index 256bd237d5..c4517bab67 100644 --- a/libavutil/cpu.c +++ b/libavutil/cpu.c @@ -130,6 +130,7 @@ int av_parse_cpu_flags(const char *s) { "vfpv3", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_VFPV3 }, .unit = "flags" }, { "neon", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_NEON }, .unit = "flags" }, #elif ARCH_AARCH64 + { "armv8", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_ARMV8 }, .unit = "flags" }, { "neon", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_NEON }, .unit = "flags" }, { "vfp", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_VFP }, .unit = "flags" }, #endif @@ -263,6 +264,7 @@ static const struct { const char *name; } cpu_flag_tab[] = { #if ARCH_AARCH64 + { AV_CPU_FLAG_ARMV8, "armv8" }, { AV_CPU_FLAG_NEON, "neon" }, { AV_CPU_FLAG_VFP, "vfp" }, #elif ARCH_ARM |