X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fdownloader%2F__init__.py;h=3f941596edd83edda99917b57187485941133e8f;hb=ee966928af5f35123c4c7417bb052ae5aea345c9;hp=0d9eb0001e774bdf75ccdf31c636947dfeecd330;hpb=f89197d73e14d33ea580b5fdaed0e84e4b6851a5;p=youtube-dl.git

diff --git a/youtube_dl/downloader/__init__.py b/youtube_dl/downloader/__init__.py
index 0d9eb0001..3f941596e 100644
--- a/youtube_dl/downloader/__init__.py
+++ b/youtube_dl/downloader/__init__.py
@@ -1,8 +1,12 @@
+from __future__ import unicode_literals
+
 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 .f4m import F4mFD
 
 from ..utils import (
     determine_ext,
@@ -12,12 +16,17 @@ from ..utils import (
 def get_suitable_downloader(info_dict):
     """Get the downloader class that can handle the info dict."""
     url = info_dict['url']
+    protocol = info_dict.get('protocol')
 
     if url.startswith('rtmp'):
         return RtmpFD
-    if determine_ext(url) == u'm3u8':
+    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'):
         return MplayerFD
+    if determine_ext(url) == 'f4m':
+        return F4mFD
     else:
         return HttpFD