projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[qqmusic] flake8
[youtube-dl]
/
youtube_dl
/
extractor
/
vgtv.py
diff --git
a/youtube_dl/extractor/vgtv.py
b/youtube_dl/extractor/vgtv.py
index db7a4bdb117df9747fbcbc6521c2465ac35dd65f..e6ee1e4715efc5d47dd3f9aa32d6559a5737a8ea 100644
(file)
--- a/
youtube_dl/extractor/vgtv.py
+++ b/
youtube_dl/extractor/vgtv.py
@@
-17,7
+17,7
@@
class VGTVIE(InfoExtractor):
(?P<host>vgtv|bt)
(?:
:|
(?P<host>vgtv|bt)
(?:
:|
- \.no/(?:tv/)?#!/(?:video|live)/
+ \.no/(?:tv/)?
\
#!/(?:video|live)/
)
(?P<id>[0-9]+)
'''
)
(?P<id>[0-9]+)
'''
@@
-103,11
+103,14
@@
class VGTVIE(InfoExtractor):
hls_url = streams.get('hls')
if hls_url:
hls_url = streams.get('hls')
if hls_url:
- formats.extend(self._extract_m3u8_formats(hls_url, video_id, 'mp4'))
+ formats.extend(self._extract_m3u8_formats(
+ hls_url, video_id, 'mp4', m3u8_id='hls'))
hds_url = streams.get('hds')
if hds_url:
hds_url = streams.get('hds')
if hds_url:
- formats.extend(self._extract_f4m_formats(hds_url + '?hdcore=3.2.0&plugin=aasp-3.2.0.77.18', video_id))
+ formats.extend(self._extract_f4m_formats(
+ hds_url + '?hdcore=3.2.0&plugin=aasp-3.2.0.77.18',
+ video_id, f4m_id='hds'))
mp4_url = streams.get('mp4')
if mp4_url:
mp4_url = streams.get('mp4')
if mp4_url:
@@
-188,5
+191,3
@@
class BTVestlendingenIE(InfoExtractor):
def _real_extract(self, url):
return self.url_result('xstream:btno:%s' % self._match_id(url), 'Xstream')
def _real_extract(self, url):
return self.url_result('xstream:btno:%s' % self._match_id(url), 'Xstream')
-
-