github/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-21 20:46:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

[ffpmeg] Allow --ffmpeg-location to be a file with different name

Browse source
This commit is contained in:
pukkandan 2021-08-04 22:25:16 +05:30
parent 8012d892bd
commit 89efdc15dd
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
yt_dlp/postprocessor/ffmpeg.py
View file

@ -111,19 +111,14 @@ def get_ffmpeg_version(path):
return return
elif not os.path.isdir(location): elif not os.path.isdir(location):
basename = os.path.splitext(os.path.basename(location))[0] basename = os.path.splitext(os.path.basename(location))[0]
if basename not in programs: basename = next((p for p in programs if basename.startswith(p)), 'ffmpeg')
self.report_warning( dirname = os.path.dirname(os.path.abspath(location))
'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))
if basename in ('ffmpeg', 'ffprobe'): if basename in ('ffmpeg', 'ffprobe'):
prefer_ffmpeg = True prefer_ffmpeg = True
self._paths = dict( 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( self._versions = dict(
(p, get_ffmpeg_version(self._paths[p])) for p in programs) (p, get_ffmpeg_version(self._paths[p])) for p in programs)
if self._versions is None: if self._versions is None: