mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-12-23 01:08:10 +00:00
[ffmpeg] Make available a property
This commit is contained in:
parent
85729c51af
commit
f740fae2a4
2 changed files with 3 additions and 2 deletions
|
@ -1301,7 +1301,7 @@ class YoutubeDL(object):
|
||||||
downloaded = []
|
downloaded = []
|
||||||
success = True
|
success = True
|
||||||
merger = FFmpegMergerPP(self, not self.params.get('keepvideo'))
|
merger = FFmpegMergerPP(self, not self.params.get('keepvideo'))
|
||||||
if not merger.available():
|
if not merger.available:
|
||||||
postprocessors = []
|
postprocessors = []
|
||||||
self.report_warning('You have requested multiple '
|
self.report_warning('You have requested multiple '
|
||||||
'formats but ffmpeg or avconv are not installed.'
|
'formats but ffmpeg or avconv are not installed.'
|
||||||
|
|
|
@ -34,7 +34,7 @@ class FFmpegPostProcessor(PostProcessor):
|
||||||
self._determine_executables()
|
self._determine_executables()
|
||||||
|
|
||||||
def check_version(self):
|
def check_version(self):
|
||||||
if not self.available():
|
if not self.available:
|
||||||
raise FFmpegPostProcessorError('ffmpeg or avconv not found. Please install one.')
|
raise FFmpegPostProcessorError('ffmpeg or avconv not found. Please install one.')
|
||||||
|
|
||||||
required_version = '10-0' if self._uses_avconv() else '1.0'
|
required_version = '10-0' if self._uses_avconv() else '1.0'
|
||||||
|
@ -108,6 +108,7 @@ class FFmpegPostProcessor(PostProcessor):
|
||||||
self.probe_basename = p
|
self.probe_basename = p
|
||||||
break
|
break
|
||||||
|
|
||||||
|
@property
|
||||||
def available(self):
|
def available(self):
|
||||||
return self.basename is not None
|
return self.basename is not None
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue