From 6310eb8010b7a3b3016e297132380cbd4e3d2d10 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 20 May 2014 05:23:52 +0200
Subject: [PATCH] avutil/cpu: force mmx on selection of higher x86 SIMD
features
Fixes various runtime failures with manually set flags that represent no
existing CPU
Fixes Ticket3653
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavutil/cpu.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/libavutil/cpu.c b/libavutil/cpu.c
index c4517bab673..454326cf2c9 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -47,6 +47,26 @@
static int flags, checked;
void av_force_cpu_flags(int arg){
+ if ( (arg & ( AV_CPU_FLAG_3DNOW |
+ AV_CPU_FLAG_3DNOWEXT |
+ AV_CPU_FLAG_SSE |
+ AV_CPU_FLAG_SSE2 |
+ AV_CPU_FLAG_SSE2SLOW |
+ AV_CPU_FLAG_SSE3 |
+ AV_CPU_FLAG_SSE3SLOW |
+ AV_CPU_FLAG_SSSE3 |
+ AV_CPU_FLAG_SSE4 |
+ AV_CPU_FLAG_SSE42 |
+ AV_CPU_FLAG_AVX |
+ AV_CPU_FLAG_XOP |
+ AV_CPU_FLAG_FMA3 |
+ AV_CPU_FLAG_FMA4 |
+ AV_CPU_FLAG_AVX2 ))
+ && !(arg & AV_CPU_FLAG_MMX)) {
+ av_log(NULL, AV_LOG_WARNING, "MMX implied by specified flags\n");
+ arg |= AV_CPU_FLAG_MMX;
+ }
+
flags = arg;
checked = arg != -1;
}
--
GitLab