diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-02-15 15:32:13 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-02-15 15:32:13 +0100 |
| commit | 4edff78531c42aa126b02a9b792f84d2775c2172 (patch) | |
| tree | 67f29a6706b9314a9013d8fe826f826340de2fd3 /youtube_dl/downloader/__init__.py | |
| parent | 72ca1d7f45488d746337cdf61a70ff25d9e8411b (diff) | |
| parent | cf1eb4515315f7cb01ccb4fbac31928040f5ce04 (diff) | |
Merge remote-tracking branch 'jaimeMF/f4m'
Conflicts:
youtube_dl/extractor/__init__.py
Diffstat (limited to 'youtube_dl/downloader/__init__.py')
| -rw-r--r-- | youtube_dl/downloader/__init__.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/youtube_dl/downloader/__init__.py b/youtube_dl/downloader/__init__.py index aaa92bc75..4ea5811a5 100644 --- a/youtube_dl/downloader/__init__.py +++ b/youtube_dl/downloader/__init__.py @@ -5,6 +5,7 @@ from .hls import HlsFD from .http import HttpFD from .mplayer import MplayerFD from .rtmp import RtmpFD +from .f4m import F4mFD from ..utils import ( determine_ext, @@ -22,5 +23,7 @@ def get_suitable_downloader(info_dict): return HlsFD if url.startswith('mms') or url.startswith('rtsp'): return MplayerFD + if determine_ext(url) == 'f4m': + return F4mFD else: return HttpFD |