aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/livestream.py
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2018-01-14 00:50:11 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2018-01-14 00:50:11 +0100
commitb382d0f71eeece4e6e1cc3662f3c89884d5ac05d (patch)
treee48661b9f1de2380d4bff94f416624827746abd7 /youtube_dl/extractor/livestream.py
parent5020cb7e8233683ef7845fea1233a95f3f775a7b (diff)
parenta86922c4702e2c8538337124c5bf02a4b5f9aa4a (diff)
downloadyoutube-dl-b382d0f71eeece4e6e1cc3662f3c89884d5ac05d.zip
youtube-dl-b382d0f71eeece4e6e1cc3662f3c89884d5ac05d.tar.gz
youtube-dl-b382d0f71eeece4e6e1cc3662f3c89884d5ac05d.tar.bz2
Merge branch 'upstream'
Diffstat (limited to 'youtube_dl/extractor/livestream.py')
-rw-r--r--youtube_dl/extractor/livestream.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/livestream.py b/youtube_dl/extractor/livestream.py
index 7f946c6..c4776bb 100644
--- a/youtube_dl/extractor/livestream.py
+++ b/youtube_dl/extractor/livestream.py
@@ -114,7 +114,7 @@ class LivestreamIE(InfoExtractor):
smil_url = video_data.get('smil_url')
if smil_url:
- formats.extend(self._extract_smil_formats(smil_url, video_id))
+ formats.extend(self._extract_smil_formats(smil_url, video_id, fatal=False))
m3u8_url = video_data.get('m3u8_url')
if m3u8_url:
@@ -338,7 +338,7 @@ class LivestreamOriginalIE(InfoExtractor):
info = {
'title': self._og_search_title(webpage),
'description': self._og_search_description(webpage),
- 'thumbnail': self._search_regex(r'channelLogo.src\s*=\s*"([^"]+)"', webpage, 'thumbnail', None),
+ 'thumbnail': self._search_regex(r'channelLogo\.src\s*=\s*"([^"]+)"', webpage, 'thumbnail', None),
}
video_data = self._download_json(stream_url, content_id)
is_live = video_data.get('isLive')