aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2016-01-31 03:38:20 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2016-01-31 04:58:10 +0800
commit809e1857c5155fb41d033b3c0215708eb41ddb55 (patch)
tree35dce836aaa634d067af68c6099b9ae4fa45ad06
parent7c38af48b91d050a5694e878a789a028fbcc0a3b (diff)
downloadyoutube-dl-809e1857c5155fb41d033b3c0215708eb41ddb55.tar.xz
[screenwavemedia] Fix HLS extension and test_TeamFour
-rw-r--r--youtube_dl/extractor/screenwavemedia.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/youtube_dl/extractor/screenwavemedia.py b/youtube_dl/extractor/screenwavemedia.py
index 05f93904c..e5d62a139 100644
--- a/youtube_dl/extractor/screenwavemedia.py
+++ b/youtube_dl/extractor/screenwavemedia.py
@@ -71,7 +71,7 @@ class ScreenwaveMediaIE(InfoExtractor):
formats = []
for source in sources:
if source['type'] == 'hls':
- formats.extend(self._extract_m3u8_formats(source['file'], video_id))
+ formats.extend(self._extract_m3u8_formats(source['file'], video_id, ext='mp4'))
else:
file_ = source.get('file')
if not file_:
@@ -107,7 +107,11 @@ class TeamFourIE(InfoExtractor):
'upload_date': '20130401',
'description': 'Check out this and more on our website: http://teamfourstar.com\nTFS Store: http://sharkrobot.com/team-four-star\nFollow on Twitter: http://twitter.com/teamfourstar\nLike on FB: http://facebook.com/teamfourstar',
'title': 'A Moment With TFS Episode 4',
- }
+ },
+ 'params': {
+ # m3u8 download
+ 'skip_download': True,
+ },
}
def _real_extract(self, url):