]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[FFmpegPostProcessor] Default of prefer ffmpeg
authorJuan M Martínez <joksnet@gmail.com>
Wed, 9 Dec 2015 23:56:00 +0000 (20:56 -0300)
committerJuan M Martínez <joksnet@gmail.com>
Wed, 9 Dec 2015 23:56:00 +0000 (20:56 -0300)
When no `downloader` is passed to `FFmpegPostProcessor`
an exception was raised trying to get the prefer ffmpeg param.

    AttributeError: 'NoneType' object has no attribute 'params'

This fixes and defaults to `False`.

youtube_dl/postprocessor/ffmpeg.py

index 5ed723bc6cae2a464e34fad6c48b5ba71e62dab9..daca5d81480337fb50a1fcb85fd69cd249475cf8 100644 (file)
@@ -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):