update wineexperimental-7.0-20220714

2 files changed, 2 insertions, 1 deletions

diff --git a/proton b/proton
index 1a1fa91f..55de1132 100755
--- a/proton
+++ b/proton
@@ -974,7 +974,8 @@ class CompatData:
             setup_steam_dir_drive()
 
             # add Steam ffmpeg libraries to path
-            if "PROTON_NO_STEAM_FFMPEG" not in os.environ or not nonzero(os.environ["PROTON_NO_STEAM_FFMPEG"]):
+            use_ffmpeg = "PROTON_NO_STEAM_FFMPEG" not in os.environ or not nonzero(os.environ["PROTON_NO_STEAM_FFMPEG"])
+            if use_ffmpeg and 'nosteamffmpeg' not in g_session.compat_config:
                 prepend_to_env_str(g_session.env, ld_path_var, steamdir + "/ubuntu12_64/video/:" + steamdir + "/ubuntu12_32/video/", ":")
 
 def comma_escaped(s):
diff --git a/wine b/wine
-Subproject 2c0b1485d99f832dcdd7a6549a80798372eacf3
+Subproject 035002b489b25c3b74399b05785b18652a54ada