push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,32 @@
--- a/imageio_ffmpeg/_utils.py
+++ b/imageio_ffmpeg/_utils.py
@@ -38,28 +38,7 @@ def get_ffmpeg_exe():
@lru_cache()
def _get_ffmpeg_exe():
- plat = get_platform()
-
- # 2. Try from here
- exe = os.path.join(_get_bin_dir(), FNAME_PER_PLATFORM.get(plat, ""))
- if exe and os.path.isfile(exe) and _is_valid_exe(exe):
- return exe
-
- # 3. Try binary from conda package
- # (installed e.g. via `conda install ffmpeg -c conda-forge`)
- if plat.startswith("win"):
- exe = os.path.join(sys.prefix, "Library", "bin", "ffmpeg.exe")
- else:
- exe = os.path.join(sys.prefix, "bin", "ffmpeg")
- if exe and os.path.isfile(exe) and _is_valid_exe(exe):
- return exe
-
- # 4. Try system ffmpeg command
- exe = "ffmpeg"
- if _is_valid_exe(exe):
- return exe
-
- return None
+ return "@ffmpeg@"
def _get_bin_dir():