youtube-dl

commit 3da4b31359c8dbbad3477fbe8341e6fc293cda82
parent 4bbeb19fc77a49af763ce3443293b29b8450d686
Author: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date:   Fri,  3 Apr 2015 14:09:50 +0200

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

'self.probe_basename' was None, so 'probe_executable' raised a KeyError exception

Diffstat:
M
youtube_dl/postprocessor/ffmpeg.py
 | 
6
+++++-

1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py
@@ -117,6 +117,10 @@ class FFmpegPostProcessor(PostProcessor):
         return self._paths[self.basename]
 
     @property
+    def probe_available(self):
+        return self.probe_basename is not None
+
+    @property
     def probe_executable(self):
         return self._paths[self.probe_basename]
 
@@ -168,7 +172,7 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
 
     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.')
         try:
             cmd = [