Mirrors
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[postprocessor/ffmpeg] Fix crash when ffprobe/avprobe are not installed (closes #5349) 

'self.probe_basename' was None, so 'probe_executable' raised a KeyError exception
This commit is contained in:
Jaime Marquínez Ferrándiz 2015-04-03 14:09:50 +02:00
parent 4bbeb19fc7
commit 3da4b31359
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
youtube_dl/postprocessor/ffmpeg.py
View File

@ -116,6 +116,10 @@ class FFmpegPostProcessor(PostProcessor):
def executable(self): def executable(self):
return self._paths[self.basename] return self._paths[self.basename]
@property
def probe_available(self):
return self.probe_basename is not None
@property @property
def probe_executable(self): def probe_executable(self):
return self._paths[self.probe_basename] return self._paths[self.probe_basename]
@ -168,7 +172,7 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
def get_audio_codec(self, path): def get_audio_codec(self, path):
if not self.probe_executable: if not self.probe_available:
raise PostProcessingError('ffprobe or avprobe not found. Please install one.') raise PostProcessingError('ffprobe or avprobe not found. Please install one.')
try: try:
cmd = [ cmd = [