Merge tag 'upstream/2014.10.30'

[youtubedl] / youtube_dl / downloader / __init__.py

diff --git a/youtube_dl/downloader/__init__.py b/youtube_dl/downloader/__init__.py
index 4ea5811a56f77180afea16b2e5fbc30056850b49..3f941596edd83edda99917b57187485941133e8f 100644 (file)
--- a/youtube_dl/downloader/__init__.py
+++ b/youtube_dl/downloader/__init__.py
@@ -2,6 +2,7 @@ from __future__ import unicode_literals
 
 from .common import FileDownloader
 from .hls import HlsFD
 
 from .common import FileDownloader
 from .hls import HlsFD

+from .hls import NativeHlsFD

 from .http import HttpFD
 from .mplayer import MplayerFD
 from .rtmp import RtmpFD
 from .http import HttpFD
 from .mplayer import MplayerFD
 from .rtmp import RtmpFD


@@ -19,6 +20,8 @@ def get_suitable_downloader(info_dict):
 
     if url.startswith('rtmp'):
         return RtmpFD
 
     if url.startswith('rtmp'):
         return RtmpFD

+    if protocol == 'm3u8_native':
+        return NativeHlsFD

     if (protocol == 'm3u8') or (protocol is None and determine_ext(url) == 'm3u8'):
         return HlsFD
     if url.startswith('mms') or url.startswith('rtsp'):
     if (protocol == 'm3u8') or (protocol is None and determine_ext(url) == 'm3u8'):
         return HlsFD
     if url.startswith('mms') or url.startswith('rtsp'):