Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2024-12-31 00:02:57 +08:00
Code Issues Releases Wiki Activity

[ffmpeg] Make available a property

Browse Source
This commit is contained in:
Philipp Hagemeister 2015-02-17 17:26:41 +01:00
parent 85729c51af
commit f740fae2a4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/YoutubeDL.py
View File

@ -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.'

3
youtube_dl/postprocessor/ffmpeg.py
View File

@ -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