diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-02-13 11:14:01 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-02-16 04:05:53 +0100 |
| commit | 73fac4e9119bc53d49e646c38529f1b6d8de734d (patch) | |
| tree | 91609ff56015f7e406924164fa73bbc4bb6e23fd /youtube_dl/YoutubeDL.py | |
| parent | c80b9cd280020e4e70e0d4336387d83101bcf50f (diff) | |
[ffmpeg] Add --ffmpeg-location
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
| -rwxr-xr-x | youtube_dl/YoutubeDL.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 13d18e25e..dbb26272d 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -1298,7 +1298,7 @@ class YoutubeDL(object): downloaded = [] success = True merger = FFmpegMergerPP(self, not self.params.get('keepvideo')) - if not merger._executable: + if not merger.available(): postprocessors = [] self.report_warning('You have requested multiple ' 'formats but ffmpeg or avconv are not installed.' @@ -1647,7 +1647,7 @@ class YoutubeDL(object): self._write_string('[debug] Python version %s - %s\n' % ( platform.python_version(), platform_name())) - exe_versions = FFmpegPostProcessor.get_versions() + exe_versions = FFmpegPostProcessor.get_versions(self) exe_versions['rtmpdump'] = rtmpdump_version() exe_str = ', '.join( '%s %s' % (exe, v) |