summaryrefslogtreecommitdiff
path: root/avconv.c
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-04-21 15:31:10 +0100
committerMans Rullgard <mans@mansr.com>2012-04-22 12:30:45 +0100
commitd526c5338d50d12a54fd95130030c60070707d3e (patch)
tree5cac97b8414872d2bdf977292e63ef8edf3eb49a /avconv.c
parentd7458bc8c62ae1cb2ffc805b989fcddf4029dda6 (diff)
ARM: allow runtime masking of CPU features
This allows masking CPU features with the -cpuflags avconv option which is useful for testing different optimisations without rebuilding. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/avconv.c b/avconv.c
index 6c3e6a9838..851d8dd7d8 100644
--- a/avconv.c
+++ b/avconv.c
@@ -4865,6 +4865,14 @@ static int opt_cpuflags(const char *opt, const char *arg)
{ "fma4" , NULL, 0, AV_OPT_TYPE_CONST, { CPUFLAG_FMA4 }, .unit = "flags" },
{ "3dnow" , NULL, 0, AV_OPT_TYPE_CONST, { CPUFLAG_3DNOW }, .unit = "flags" },
{ "3dnowext", NULL, 0, AV_OPT_TYPE_CONST, { CPUFLAG_3DNOWEXT }, .unit = "flags" },
+
+ { "armv5te", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV5TE }, .unit = "flags" },
+ { "armv6", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV6 }, .unit = "flags" },
+ { "armv6t2", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV6T2 }, .unit = "flags" },
+ { "vfp", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_VFP }, .unit = "flags" },
+ { "vfpv3", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_VFPV3 }, .unit = "flags" },
+ { "neon", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_NEON }, .unit = "flags" },
+
{ NULL },
};
static const AVClass class = {