New upstream version 2017.12.31

[youtubedl] / youtube_dl / downloader / __init__.py

diff --git a/youtube_dl/downloader/__init__.py b/youtube_dl/downloader/__init__.py
index 817591d97e88606b966b7055026f691faab840dc..2e485df9dac09e197af6183ded3570e57805fad2 100644 (file)
--- a/youtube_dl/downloader/__init__.py
+++ b/youtube_dl/downloader/__init__.py
@@ -7,6 +7,7 @@ from .http import HttpFD
 from .rtmp import RtmpFD
 from .dash import DashSegmentsFD
 from .rtsp import RtspFD
 from .rtmp import RtmpFD
 from .dash import DashSegmentsFD
 from .rtsp import RtspFD

+from .ism import IsmFD

 from .external import (
     get_external_downloader,
     FFmpegFD,
 from .external import (
     get_external_downloader,
     FFmpegFD,


@@ -24,6 +25,7 @@ PROTOCOL_MAP = {
     'rtsp': RtspFD,
     'f4m': F4mFD,
     'http_dash_segments': DashSegmentsFD,
     'rtsp': RtspFD,
     'f4m': F4mFD,
     'http_dash_segments': DashSegmentsFD,

+    'ism': IsmFD,

 }
 
 
 }
 
 


@@ -41,6 +43,9 @@ def get_suitable_downloader(info_dict, params={}):
         if ed.can_download(info_dict):
             return ed
 
         if ed.can_download(info_dict):
             return ed
 

+    if protocol.startswith('m3u8') and info_dict.get('is_live'):
+        return FFmpegFD
+

     if protocol == 'm3u8' and params.get('hls_prefer_native') is True:
         return HlsFD
 
     if protocol == 'm3u8' and params.get('hls_prefer_native') is True:
         return HlsFD