diff options
| author | Sergey M <dstftw@gmail.com> | 2015-12-10 22:10:20 +0600 |
|---|---|---|
| committer | Sergey M <dstftw@gmail.com> | 2015-12-10 22:10:20 +0600 |
| commit | dfd42a43c3df90507e37f2247eb36ffe07780018 (patch) | |
| tree | a31f5fd50c84a78dadac494d07fac71b0c071751 /youtube_dl | |
| parent | f7b8dd63f0b99a6953f1ab0645c923ca2f1e157d (diff) | |
| parent | 374c761e77b09b07918f525ad74724650309015f (diff) | |
Merge pull request #7821 from joksnet/patch-1
[FFmpegPostProcessor] Default of prefer ffmpeg
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/postprocessor/ffmpeg.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index 5ed723bc6..daca5d814 100644 --- 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): |