diff options
| author | pukkandan <pukkandan.ytdlp@gmail.com> | 2021-08-09 02:18:58 +0530 |
|---|---|---|
| committer | pukkandan <pukkandan.ytdlp@gmail.com> | 2021-08-10 01:22:55 +0530 |
| commit | 8c0ae192a42965f318644373d05060e720af79c7 (patch) | |
| tree | 5b684b6889c7890e3f7d5038d0969f5b59c48cb5 | |
| parent | e9f4ccd19eb92621970b518fb5984b8aef52bdc8 (diff) | |
| download | hypervideo-pre-8c0ae192a42965f318644373d05060e720af79c7.tar.lz hypervideo-pre-8c0ae192a42965f318644373d05060e720af79c7.tar.xz hypervideo-pre-8c0ae192a42965f318644373d05060e720af79c7.zip | |
[ffmpeg] Fix `--ffmpeg-location` when directory is given
Bug introduced in 89efdc15dd4dbdb4b51e82647637f33112156f61
Closes #654
| -rw-r--r-- | yt_dlp/postprocessor/ffmpeg.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/yt_dlp/postprocessor/ffmpeg.py b/yt_dlp/postprocessor/ffmpeg.py index bf6677239..24466f21c 100644 --- a/yt_dlp/postprocessor/ffmpeg.py +++ b/yt_dlp/postprocessor/ffmpeg.py @@ -109,7 +109,9 @@ class FFmpegPostProcessor(PostProcessor): 'Continuing without ffmpeg.' % (location)) self._versions = {} return - elif not os.path.isdir(location): + elif os.path.isdir(location): + dirname, basename = location, None + else: basename = os.path.splitext(os.path.basename(location))[0] basename = next((p for p in programs if basename.startswith(p)), 'ffmpeg') dirname = os.path.dirname(os.path.abspath(location)) @@ -118,7 +120,8 @@ class FFmpegPostProcessor(PostProcessor): self._paths = dict( (p, os.path.join(dirname, p)) for p in programs) - self._paths[basename] = location + if basename: + self._paths[basename] = location self._versions = dict( (p, get_ffmpeg_version(self._paths[p])) for p in programs) if self._versions is None: |