w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[FFmpegPostProcessor] Default of prefer ffmpeg

Browse source 
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`.
This commit is contained in:
Juan M Martínez 2015-12-09 20:56:00 -03:00
parent 6c7b26e13f
commit 374c761e77
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
youtube_dl/postprocessor/ffmpeg.py
View 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):