diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-10-24 21:04:09 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-10-24 21:04:09 +0600 |
| commit | 8e82ecfe8f0dc2b9dfb6a2cda68e7b5f7926b0e8 (patch) | |
| tree | 1dee6fbb34ee1fd5ee5aaab1011ff8285e8f6326 | |
| parent | ec29539e06e156a2bb589af774a80d156b2c2f76 (diff) | |
| download | youtube-dl-8e82ecfe8f0dc2b9dfb6a2cda68e7b5f7926b0e8.tar.gz youtube-dl-8e82ecfe8f0dc2b9dfb6a2cda68e7b5f7926b0e8.tar.xz youtube-dl-8e82ecfe8f0dc2b9dfb6a2cda68e7b5f7926b0e8.zip | |
[dailymotion] Extract f4m formats
| -rw-r--r-- | youtube_dl/extractor/dailymotion.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py index 9cd9ff17d..bc7823931 100644 --- a/youtube_dl/extractor/dailymotion.py +++ b/youtube_dl/extractor/dailymotion.py @@ -141,9 +141,17 @@ class DailymotionIE(DailymotionBaseInfoExtractor): type_ = media.get('type') if type_ == 'application/vnd.lumberjack.manifest': continue - if type_ == 'application/x-mpegURL' or determine_ext(media_url) == 'm3u8': - formats.extend(self._extract_m3u8_formats( - media_url, video_id, 'mp4', m3u8_id='hls')) + ext = determine_ext(media_url) + if type_ == 'application/x-mpegURL' or ext == 'm3u8': + m3u8_formats = self._extract_m3u8_formats( + media_url, video_id, 'mp4', m3u8_id='hls', fatal=False) + if m3u8_formats: + formats.extend(m3u8_formats) + elif type_ == 'application/f4m' or ext == 'f4m': + f4m_formats = self._extract_f4m_formats( + media_url, video_id, preference=-1, f4m_id='hds', fatal=False) + if f4m_formats: + formats.extend(f4m_formats) else: f = { 'url': media_url, |