Merge tag 'upstream/2015.05.15'

[youtubedl] / youtube_dl / downloader / __init__.py

diff --git a/youtube_dl/downloader/__init__.py b/youtube_dl/downloader/__init__.py
index eff1122c5c09eff494ad34af835b06e33c9e4751..f110830c472eb451d77b48fa9337bd5feee55952 100644 (file)
--- a/youtube_dl/downloader/__init__.py
+++ b/youtube_dl/downloader/__init__.py
@@ -6,7 +6,7 @@ from .f4m import F4mFD
 from .hls import HlsFD
 from .hls import NativeHlsFD
 from .http import HttpFD
 from .hls import HlsFD
 from .hls import NativeHlsFD
 from .http import HttpFD

-from .mplayer import MplayerFD
+from .rtsp import RtspFD

 from .rtmp import RtmpFD
 
 from ..utils import (
 from .rtmp import RtmpFD
 
 from ..utils import (


@@ -17,8 +17,8 @@ PROTOCOL_MAP = {
     'rtmp': RtmpFD,
     'm3u8_native': NativeHlsFD,
     'm3u8': HlsFD,
     'rtmp': RtmpFD,
     'm3u8_native': NativeHlsFD,
     'm3u8': HlsFD,

-    'mms': MplayerFD,
-    'rtsp': MplayerFD,
+    'mms': RtspFD,
+    'rtsp': RtspFD,

     'f4m': F4mFD,
 }
 
     'f4m': F4mFD,
 }
 


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

+    if protocol == 'm3u8' and params.get('hls_prefer_native'):
+        return NativeHlsFD
+

     return PROTOCOL_MAP.get(protocol, HttpFD)
 
 
     return PROTOCOL_MAP.get(protocol, HttpFD)