|
|
@ -109,7 +109,8 @@ class FFmpegPostProcessor(PostProcessor):
|
|
|
|
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 @@ class FFmpegPostProcessor(PostProcessor):
|
|
|
|
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':
|
|
|
|