From 89076410dedf96fdf66b2ff1a759e70ad64d9055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 18 Oct 2021 15:48:41 +0200 Subject: [PATCH] WebM: Disable SIMD optimization with YASM on Windows It triggers a crash when playing V9 videos. Could likely be fixed if anyone wants to work on it, but so far nobody seems to want to and WebM support is dropped in 4.0, so this workaround should help for now. Fixes #50862. --- modules/webm/libvpx/SCsub | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/webm/libvpx/SCsub b/modules/webm/libvpx/SCsub index a8b520ccbaa..8a4a6fb5f34 100644 --- a/modules/webm/libvpx/SCsub +++ b/modules/webm/libvpx/SCsub @@ -224,7 +224,7 @@ if env["platform"] == "uwp": webm_cpu_arm = True else: webm_cpu_x86 = True -else: +elif env["platform"] != "windows": # Disable for Windows, yasm SIMD optimizations trigger crash (GH-50862). import platform is_x11_or_server_arm = (env["platform"] == "x11" or env["platform"] == "server") and ( @@ -322,7 +322,7 @@ if webm_cpu_arm: webm_simd_optimizations = True -if webm_simd_optimizations == False: +if webm_simd_optimizations == False and env["platform"] != "windows": print("WebM SIMD optimizations are disabled. Check if your CPU architecture, CPU bits or platform are supported!") env_libvpx.add_source_files(env.modules_sources, libvpx_sources)