MarcoBuster/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-27 15:16:52 +01:00
Code Issues Projects Releases Wiki Activity

[ffmpeg] Disable avconv unless --prefer-avconv

Browse Source
This commit is contained in:
pukkandan 2022-08-09 04:15:37 +05:30
parent 81e0195998
commit c220d9efc8
No known key found for this signature in database
GPG Key ID: 7EEE9E1E817D0A39
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yt_dlp/postprocessor/ffmpeg.py
View File

@ -109,7 +109,8 @@ def _determine_executables(self):
return {p: p for p in programs} return {p: p for p in programs}
if not os.path.exists(location): if not os.path.exists(location):
self.report_warning(f'ffmpeg-location {location} does not exist! Continuing without ffmpeg') self.report_warning(
f'ffmpeg-location {location} does not exist! Continuing without ffmpeg', only_once=True)
return {} return {}
elif os.path.isdir(location): elif os.path.isdir(location):
dirname, basename = location, None dirname, basename = location, None
@ -171,9 +172,9 @@ def probe_basename(self):
return self.probe_basename return self.probe_basename
def _get_version(self, kind): def _get_version(self, kind):
executables = (kind, self._ffmpeg_to_avconv[kind]) executables = (kind, )
if not self._prefer_ffmpeg: if not self._prefer_ffmpeg:
executables = reversed(executables) executables = (kind, self._ffmpeg_to_avconv[kind])
basename, version, features = next(filter( basename, version, features = next(filter(
lambda x: x[1], ((p, *self._get_ffmpeg_version(p)) for p in executables)), (None, None, {})) lambda x: x[1], ((p, *self._get_ffmpeg_version(p)) for p in executables)), (None, None, {}))
if kind == 'ffmpeg': if kind == 'ffmpeg':