youtube-dl

commit dfd42a43c3df90507e37f2247eb36ffe07780018
parent f7b8dd63f0b99a6953f1ab0645c923ca2f1e157d
Author: Sergey M <dstftw@gmail.com>
Date:   Thu, 10 Dec 2015 22:10:20 +0600

Merge pull request #7821 from joksnet/patch-1

[FFmpegPostProcessor] Default of prefer ffmpeg
Diffstat:
M
youtube_dl/postprocessor/ffmpeg.py
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py
@@ -52,7 +52,7 @@ class FFmpegPostProcessor(PostProcessor):
 
     def _determine_executables(self):
         programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe']
-        prefer_ffmpeg = self._downloader.params.get('prefer_ffmpeg', False)
+        prefer_ffmpeg = False
 
         self.basename = None
         self.probe_basename = None
@@ -60,6 +60,7 @@ class FFmpegPostProcessor(PostProcessor):
         self._paths = None
         self._versions = None
         if self._downloader:
+            prefer_ffmpeg = self._downloader.params.get('prefer_ffmpeg', False)
             location = self._downloader.params.get('ffmpeg_location')
             if location is not None:
                 if not os.path.exists(location):