浏览代码

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

'self.probe_basename' was None, so 'probe_executable' raised a KeyError exception
Jaime Marquínez Ferrándiz 10 年之前
父节点
当前提交
3da4b31359
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      youtube_dl/postprocessor/ffmpeg.py

+ 5 - 1
youtube_dl/postprocessor/ffmpeg.py

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