aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-06 13:59:18 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-11 19:07:11 +0200
commitffc66ac0d641f3527d2f910dc3d37ea558513407 (patch)
tree63a24c2e7b2a0e66d4875fc2cafa10bfb854a4e3
parent588e7226edb823392e6c43b0af81c52ceebc1128 (diff)
downloadffmpeg-ffc66ac0d641f3527d2f910dc3d37ea558513407.tar.gz
avutil/cpu: add aarch64 entries to 2nd table
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit efc4fe9d74a5040e465dbff80b29468dbc227c19) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/cpu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavutil/cpu.c b/libavutil/cpu.c
index d6d93a35d6..f4d3d14e6c 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -224,6 +224,9 @@ int av_parse_cpu_caps(unsigned *flags, const char *s)
{ "vfp", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_VFP }, .unit = "flags" },
{ "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
+ { "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
{ NULL },
};