From: Sergey M․ <dstftw@gmail.com>
Date: Thu, 14 May 2015 09:18:58 +0000 (+0600)
Subject: Merge branch 'best-fallback-on-outdated-avconv' of https://github.com/dstftw/youtube... 
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=98b8ec8616611194dee77dc6ad88303bae72ce6d;p=youtube-dl

Merge branch 'best-fallback-on-outdated-avconv' of https://github.com/dstftw/youtube-dl into dstftw-best-fallback-on-outdated-avconv

Conflicts:
	youtube_dl/YoutubeDL.py
---

98b8ec8616611194dee77dc6ad88303bae72ce6d
diff --cc youtube_dl/YoutubeDL.py
index 0fbfe9642,00f86b342..4c8196d08
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@@ -1085,10 -1085,11 +1085,11 @@@ class YoutubeDL(object)
          req_format = self.params.get('format')
          if req_format is None:
              req_format_list = []
 -            if (self.params.get('outtmpl', DEFAULT_OUTTMPL) != '-'
 -                    and info_dict['extractor'] in ['youtube', 'ted']):
 +            if (self.params.get('outtmpl', DEFAULT_OUTTMPL) != '-' and
-                     info_dict['extractor'] in ['youtube', 'ted'] and
-                     FFmpegMergerPP(self).available):
-                 req_format_list.append('bestvideo+bestaudio')
++                    info_dict['extractor'] in ['youtube', 'ted']):
+                 merger = FFmpegMergerPP(self)
+                 if merger.available and merger.can_merge():
+                     req_format_list.append('bestvideo+bestaudio')
              req_format_list.append('best')
              req_format = '/'.join(req_format_list)
          formats_to_download = []