diff options
author | Sergey M․ <dstftw@gmail.com> | 2015-12-29 00:58:24 +0600 |
---|---|---|
committer | Sergey M․ <dstftw@gmail.com> | 2015-12-29 00:58:24 +0600 |
commit | 7e5edcfd333f05c610bd70c33f3d3fd0ff6a7cec (patch) | |
tree | cdb7507ea699e228587c945d24c38b716d696216 /youtube_dl/extractor/dailymotion.py | |
parent | 39d60b715a75e92d169167876bb07424301c0b67 (diff) |
Simplify formats accumulation for f4m/m3u8/smil formats
Now all _extract_*_formats routines return a list
Diffstat (limited to 'youtube_dl/extractor/dailymotion.py')
-rw-r--r-- | youtube_dl/extractor/dailymotion.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py index 0c5b6617f..439fd42e8 100644 --- a/youtube_dl/extractor/dailymotion.py +++ b/youtube_dl/extractor/dailymotion.py @@ -148,15 +148,11 @@ class DailymotionIE(DailymotionBaseInfoExtractor): continue 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) + formats.extend(self._extract_m3u8_formats( + media_url, video_id, 'mp4', m3u8_id='hls', fatal=False)) 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) + formats.extend(self._extract_f4m_formats( + media_url, video_id, preference=-1, f4m_id='hds', fatal=False)) else: f = { 'url': media_url, |