X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2FYoutubeDL.py;h=a68b24ab485d6ef8e064ee7533a4a15379eb87cf;hb=65c1a750f5e5327a2ec8f702509eba05364ca4fa;hp=4fa2223ad2ea5a5799622c9d9b38b90edf193337;hpb=1a944d8a2ae8756b78a709862cccae58720445ba;p=youtube-dl.git diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 4fa2223ad..a68b24ab4 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -919,6 +919,11 @@ class YoutubeDL(object): if format_spec == 'best' or format_spec is None: return available_formats[-1] elif format_spec == 'worst': + audiovideo_formats = [ + f for f in available_formats + if f.get('vcodec') != 'none' and f.get('acodec') != 'none'] + if audiovideo_formats: + return audiovideo_formats[0] return available_formats[0] elif format_spec == 'bestaudio': audio_formats = [ @@ -1768,12 +1773,6 @@ class YoutubeDL(object): debuglevel = 1 if self.params.get('debug_printtraffic') else 0 https_handler = make_HTTPS_handler(self.params, debuglevel=debuglevel) - # The ssl context is only available in python 2.7.9 and 3.x - if hasattr(https_handler, '_context'): - if len(https_handler._context.get_ca_certs()) == 0: - self.report_warning( - 'No ssl certificates were loaded, urls that use https ' - 'won\'t work') ydlh = YoutubeDLHandler(self.params, debuglevel=debuglevel) opener = compat_urllib_request.build_opener( proxy_handler, https_handler, cookie_processor, ydlh)