aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/cpu.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2014-02-06 01:34:01 -0300
committerMichael Niedermayer <michaelni@gmx.at>2014-02-06 22:45:57 +0100
commita4e4948ffe360fc1b307f5b24e7f16826d83a26b (patch)
treed1b8e1d7ecc2b52bcd170d1de752979b304cd31b /libavutil/cpu.c
parentd5733936d857ce5c7d28c0bc9e89a2e2548f8895 (diff)
downloadffmpeg-a4e4948ffe360fc1b307f5b24e7f16826d83a26b.tar.gz
x86/cpu: add missing avx2 AVOption in av_parse_cpu_flags()
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/cpu.c')
-rw-r--r--libavutil/cpu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/cpu.c b/libavutil/cpu.c
index d53f497fcc..9ac599826d 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -167,6 +167,7 @@ int av_parse_cpu_caps(unsigned *flags, const char *s)
{ "avx" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_AVX }, .unit = "flags" },
{ "xop" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_XOP }, .unit = "flags" },
{ "fma4" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_FMA4 }, .unit = "flags" },
+ { "avx2" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_AVX2 }, .unit = "flags" },
{ "3dnow" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_3DNOW }, .unit = "flags" },
{ "3dnowext", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_3DNOWEXT }, .unit = "flags" },
{ "cmov", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_CMOV }, .unit = "flags" },