Home Explore Help
Sign In
SMusatov
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Files Wiki
Browse Source

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>
James Almer 11 years ago
parent
d5733936d8
commit
a4e4948ffe
2 changed files with 2 additions and 1 deletions
Split View Show Diff Stats
  1. 1 0
      libavutil/cpu.c
  2. 1 1
      libavutil/version.h

+ 1 - 0
libavutil/cpu.c
View File 

@@ -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" },

+ 1 - 1
libavutil/version.h
View File 

@@ -57,7 +57,7 @@
 
 
 #define LIBAVUTIL_VERSION_MAJOR  52
 
 #define LIBAVUTIL_VERSION_MINOR  63
 
-#define LIBAVUTIL_VERSION_MICRO 100
 
+#define LIBAVUTIL_VERSION_MICRO 101
 
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
 
                                                LIBAVUTIL_VERSION_MINOR, \