Skip to content

[B] Fix handling of locally available ffmpeg/ffprobe executables #813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ciphercom wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[B] Fix handling of locally available ffmpeg/ffprobe executables #813

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1680a19
[B] fixes problem with only locally available ffmpeg/ffprobe executables
ciphercom Sep 16, 2024
f3aa1c8
[B] fixes non updated occurrence of direct usage of "ffprobe"
ciphercom Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions pydub/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@ def get_encoder_name():
"""
Return enconder default application for system, either avconv or ffmpeg
"""
if which("avconv"):
return "avconv"
elif which("ffmpeg"):
return "ffmpeg"
if path := which("avconv"):
return path
elif path := which("ffmpeg"):
return path
else:
# should raise exception
warn("Couldn't find ffmpeg or avconv - defaulting to ffmpeg, but may not work", RuntimeWarning)
Expand All @@ -179,10 +179,10 @@ def get_player_name():
"""
Return enconder default application for system, either avconv or ffmpeg
"""
if which("avplay"):
return "avplay"
elif which("ffplay"):
return "ffplay"
if path := which("avplay"):
return path
elif path := which("ffplay"):
return path
else:
# should raise exception
warn("Couldn't find ffplay or avplay - defaulting to ffplay, but may not work", RuntimeWarning)
Expand All @@ -193,10 +193,10 @@ def get_prober_name():
"""
Return probe application, either avconv or ffmpeg
"""
if which("avprobe"):
return "avprobe"
elif which("ffprobe"):
return "ffprobe"
if path := which("avprobe"):
return path
elif path := which("ffprobe"):
return path
else:
# should raise exception
warn("Couldn't find ffprobe or avprobe - defaulting to ffprobe, but may not work", RuntimeWarning)
Expand Down Expand Up @@ -262,7 +262,7 @@ def mediainfo_json(filepath, read_ahead_limit=-1):
stdin_parameter = None
stdin_data = None
except TypeError:
if prober == 'ffprobe':
if prober.endswith('ffprobe'):
command_args += ["-read_ahead_limit", str(read_ahead_limit),
"cache:pipe:0"]
else:
Expand Down