aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-20 05:23:52 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-25 23:15:37 +0200
commite68114868ffdca34694345599db2c452d7f54a94 (patch)
treeec67b5aa98a22dbecb6d1ebdb391762bc717f3e0
parent4533e8b30a384e8b9bff9d228a028c1f58b4c6aa (diff)
downloadffmpeg-e68114868ffdca34694345599db2c452d7f54a94.tar.gz
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> (cherry picked from commit 6310eb8010b7a3b3016e297132380cbd4e3d2d10) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/cpu.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/libavutil/cpu.c b/libavutil/cpu.c
index a1d1547033..85bc2d6499 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -23,6 +23,24 @@
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_FMA4 ))
+ && !(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;
}