youtube-dl

Another place where youtube-dl lives on
git clone git://git.oshgnacknak.de/youtube-dl.git
Log | Files | Refs | README | LICENSE

commit dfa50793d8541ff2c5603f7c3b727c0f6e551d8d
parent e2b944cf4342a1920da4ec99e2d0e5f5dcf11cc1
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Sat, 18 Jan 2014 20:42:51 -0800

Merge pull request #2153 from jaimeMF/ffmpeg-merger-check-install

Don’t try to merge the formats if ffmpeg or avconv are not installed
Diffstat:
Myoutube_dl/YoutubeDL.py | 10+++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py @@ -908,6 +908,14 @@ class YoutubeDL(object): if info_dict.get('requested_formats') is not None: downloaded = [] success = True + merger = FFmpegMergerPP(self) + if not merger._get_executable(): + postprocessors = [] + self.report_warning('You have requested multiple ' + 'formats but ffmpeg or avconv are not installed.' + ' The formats won\'t be merged') + else: + postprocessors = [merger] for f in info_dict['requested_formats']: new_info = dict(info_dict) new_info.update(f) @@ -916,7 +924,7 @@ class YoutubeDL(object): downloaded.append(fname) partial_success = dl(fname, new_info) success = success and partial_success - info_dict['__postprocessors'] = [FFmpegMergerPP(self)] + info_dict['__postprocessors'] = postprocessors info_dict['__files_to_merge'] = downloaded else: # Just a single file