|
@ -52,7 +52,7 @@ class FFmpegPostProcessor(PostProcessor): |
|
|
|
|
|
|
|
|
def _determine_executables(self): |
|
|
def _determine_executables(self): |
|
|
programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe'] |
|
|
programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe'] |
|
|
prefer_ffmpeg = self._downloader.params.get('prefer_ffmpeg', False) |
|
|
|
|
|
|
|
|
prefer_ffmpeg = False |
|
|
|
|
|
|
|
|
self.basename = None |
|
|
self.basename = None |
|
|
self.probe_basename = None |
|
|
self.probe_basename = None |
|
@ -60,6 +60,7 @@ class FFmpegPostProcessor(PostProcessor): |
|
|
self._paths = None |
|
|
self._paths = None |
|
|
self._versions = None |
|
|
self._versions = None |
|
|
if self._downloader: |
|
|
if self._downloader: |
|
|
|
|
|
prefer_ffmpeg = self._downloader.params.get('prefer_ffmpeg', False) |
|
|
location = self._downloader.params.get('ffmpeg_location') |
|
|
location = self._downloader.params.get('ffmpeg_location') |
|
|
if location is not None: |
|
|
if location is not None: |
|
|
if not os.path.exists(location): |
|
|
if not os.path.exists(location): |
|
|