From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Fri, 3 Apr 2015 12:09:50 +0000 (+0200)
Subject: [postprocessor/ffmpeg] Fix crash when ffprobe/avprobe are not installed (closes ... 
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=3da4b31359c8dbbad3477fbe8341e6fc293cda82;p=youtube-dl

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

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

diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py
index 55adf9685..0b60ac7e7 100644
--- a/youtube_dl/postprocessor/ffmpeg.py
+++ b/youtube_dl/postprocessor/ffmpeg.py
@@ -116,6 +116,10 @@ class FFmpegPostProcessor(PostProcessor):
     def executable(self):
         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 = [