diff options
| author | pukkandan <pukkandan.ytdlp@gmail.com> | 2021-08-04 22:25:16 +0530 |
|---|---|---|
| committer | pukkandan <pukkandan.ytdlp@gmail.com> | 2021-08-05 03:37:18 +0530 |
| commit | 89efdc15dd4dbdb4b51e82647637f33112156f61 (patch) | |
| tree | c6095c3ae40640fd7b3865a81454350e65dcefb8 | |
| parent | 8012d892bd38af731357a61e071e0a0d01bc41b4 (diff) | |
| download | hypervideo-pre-89efdc15dd4dbdb4b51e82647637f33112156f61.tar.lz hypervideo-pre-89efdc15dd4dbdb4b51e82647637f33112156f61.tar.xz hypervideo-pre-89efdc15dd4dbdb4b51e82647637f33112156f61.zip | |
[ffpmeg] Allow `--ffmpeg-location` to be a file with different name
| -rw-r--r-- | yt_dlp/postprocessor/ffmpeg.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/yt_dlp/postprocessor/ffmpeg.py b/yt_dlp/postprocessor/ffmpeg.py index eb5ae1737..bf6677239 100644 --- a/yt_dlp/postprocessor/ffmpeg.py +++ b/yt_dlp/postprocessor/ffmpeg.py @@ -111,19 +111,14 @@ class FFmpegPostProcessor(PostProcessor): return elif not os.path.isdir(location): basename = os.path.splitext(os.path.basename(location))[0] - if basename not in programs: - self.report_warning( - 'Cannot identify executable %s, its basename should be one of %s. ' - 'Continuing without ffmpeg.' % - (location, ', '.join(programs))) - self._versions = {} - return None - location = os.path.dirname(os.path.abspath(location)) + basename = next((p for p in programs if basename.startswith(p)), 'ffmpeg') + dirname = os.path.dirname(os.path.abspath(location)) if basename in ('ffmpeg', 'ffprobe'): prefer_ffmpeg = True self._paths = dict( - (p, os.path.join(location, p)) for p in programs) + (p, os.path.join(dirname, p)) for p in programs) + self._paths[basename] = location self._versions = dict( (p, get_ffmpeg_version(self._paths[p])) for p in programs) if self._versions is None: |