Merge branch 'dcn' of github.com:remitamine/youtube-dl into remitamine-dcn

[youtube-dl] / youtube_dl / extractor / livestream.py

diff --git a/youtube_dl/extractor/livestream.py b/youtube_dl/extractor/livestream.py
index 11168fc4dce3ca0d9d440ef286d68ad68df29e5b..688eb23081c370c742e9190a24f0ff7c02f35bf9 100644 (file)
--- a/youtube_dl/extractor/livestream.py
+++ b/youtube_dl/extractor/livestream.py
@@ -97,6 +97,8 @@ class LivestreamIE(InfoExtractor):
             video_url = video_data.get(key)
             if video_url:
                 ext = determine_ext(video_url)
+                if ext == 'm3u8':
+                    continue
                 bitrate = int_or_none(self._search_regex(
                     r'(\d+)\.%s' % ext, video_url, 'bitrate', default=None))
                 formats.append({
@@ -252,7 +254,7 @@ class LivestreamOriginalIE(InfoExtractor):
         'playlist_mincount': 4,
     }, {
         # live stream
-        'url': 'http://www.livestream.com/znsbahamas',
+        'url': 'http://original.livestream.com/znsbahamas',
         'only_matching': True,
     }]