Merge commit '8637f4edeee1a6bd18bc90740fafadd3e1b412aa' into release/0.10

* commit '8637f4edeee1a6bd18bc90740fafadd3e1b412aa': x86: Add CPU flag for the i686 cmov instruction Conflicts: doc/APIchanges libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2025-12-21 22:40:18 +01:00 · 2015-03-11 22:04:04 +01:00
parent efdca97cf1 8637f4edee
commit a19a10a53e
4 changed files with 7 additions and 0 deletions
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -69,6 +69,7 @@ static const struct {
    { AV_CPU_FLAG_FMA4,      "fma4"       },
    { AV_CPU_FLAG_3DNOW,     "3dnow"      },
    { AV_CPU_FLAG_3DNOWEXT,  "3dnowext"   },
+    { AV_CPU_FLAG_CMOV,      "cmov"       },
 #endif
    { 0 }
 };