aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpukkandan <pukkandan.ytdlp@gmail.com>2022-08-09 04:15:37 +0530
committerpukkandan <pukkandan.ytdlp@gmail.com>2022-08-09 05:15:38 +0530
commitc220d9efc892a5d94feaeb803e5f5f0a85fd2146 (patch)
tree2899e10e5ec2723d74e23f4955ce90d82f986f51
parent81e019599835fdb76e661c4b54043eea4ebffff4 (diff)
downloadhypervideo-pre-c220d9efc892a5d94feaeb803e5f5f0a85fd2146.tar.lz
hypervideo-pre-c220d9efc892a5d94feaeb803e5f5f0a85fd2146.tar.xz
hypervideo-pre-c220d9efc892a5d94feaeb803e5f5f0a85fd2146.zip
[ffmpeg] Disable avconv unless `--prefer-avconv`
-rw-r--r--yt_dlp/postprocessor/ffmpeg.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/yt_dlp/postprocessor/ffmpeg.py b/yt_dlp/postprocessor/ffmpeg.py
index 45f7ab32e..f663cc28e 100644
--- a/yt_dlp/postprocessor/ffmpeg.py
+++ b/yt_dlp/postprocessor/ffmpeg.py
@@ -109,7 +109,8 @@ class FFmpegPostProcessor(PostProcessor):
return {p: p for p in programs}
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 {}
elif os.path.isdir(location):
dirname, basename = location, None
@@ -171,9 +172,9 @@ class FFmpegPostProcessor(PostProcessor):
return self.probe_basename
def _get_version(self, kind):
- executables = (kind, self._ffmpeg_to_avconv[kind])
+ executables = (kind, )
if not self._prefer_ffmpeg:
- executables = reversed(executables)
+ executables = (kind, self._ffmpeg_to_avconv[kind])
basename, version, features = next(filter(
lambda x: x[1], ((p, *self._get_ffmpeg_version(p)) for p in executables)), (None, None, {}))
if kind == 'ffmpeg':