Revert "proton: Add PROTON_NO_STEAM_FFMPEG to ignore ffmpeg that ships with Steam."
This reverts commit 5720dd3e9c
.
This commit is contained in:
parent
ae688238b9
commit
3ffb520d58
2 changed files with 1 additions and 4 deletions
|
@ -309,7 +309,6 @@ the Wine prefix. Removing the option will revert to the previous behavior.
|
|||
| `hidenvgpu` | `PROTON_HIDE_NVIDIA_GPU` | Force Nvidia GPUs to always be reported as AMD GPUs. Some games require this if they depend on Windows-only Nvidia driver functionality. See also DXVK's nvapiHack config, which only affects reporting from Direct3D. |
|
||||
| | `WINE_FULLSCREEN_INTEGER_SCALING` | Enable integer scaling mode, to give sharp pixels when upscaling. |
|
||||
| `cmdlineappend:` | | Append the string after the colon as an argument to the game command. May be specified more than once. Escape commas and backslashes with a backslash. |
|
||||
| `nosteamffmpeg` | `PROTON_NO_STEAM_FFMPEG` | Ignore ffmpeg that ships with Steam. Some videos may not play. |
|
||||
| `xalia` | `PROTON_USE_XALIA` | Enable Xalia, a program that can add a gamepad UI for some keyboard/mouse interfaces. |
|
||||
| `seccomp` | `PROTON_USE_SECCOMP` | **Note: Obsoleted in Proton 5.13.** In older versions, enable seccomp-bpf filter to emulate native syscalls, required for some DRM protections to work. |
|
||||
| `d9vk` | `PROTON_USE_D9VK` | **Note: Obsoleted in Proton 5.0.** In older versions, use Vulkan-based DXVK instead of OpenGL-based wined3d for d3d9. |
|
||||
|
|
4
proton
4
proton
|
@ -1004,9 +1004,7 @@ class CompatData:
|
|||
setup_steam_dir_drive()
|
||||
|
||||
# add Steam ffmpeg libraries to path
|
||||
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/", ":")
|
||||
prepend_to_env_str(g_session.env, ld_path_var, steamdir + "/ubuntu12_64/video/:" + steamdir + "/ubuntu12_32/video/", ":")
|
||||
|
||||
def comma_escaped(s):
|
||||
escaped = False
|
||||
|
|
Loading…
Reference in a new issue