X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fvgtv.py;h=e6ee1e4715efc5d47dd3f9aa32d6559a5737a8ea;hb=548897396158d7822020f45c10301e9ca3c46453;hp=db7a4bdb117df9747fbcbc6521c2465ac35dd65f;hpb=d47e980d0de4aeeca757433365836b61c2ee9f9f;p=youtube-dl diff --git a/youtube_dl/extractor/vgtv.py b/youtube_dl/extractor/vgtv.py index db7a4bdb1..e6ee1e471 100644 --- a/youtube_dl/extractor/vgtv.py +++ b/youtube_dl/extractor/vgtv.py @@ -17,7 +17,7 @@ class VGTVIE(InfoExtractor): (?Pvgtv|bt) (?: :| - \.no/(?:tv/)?#!/(?:video|live)/ + \.no/(?:tv/)?\#!/(?:video|live)/ ) (?P[0-9]+) ''' @@ -103,11 +103,14 @@ class VGTVIE(InfoExtractor): 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: - 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: @@ -188,5 +191,3 @@ class BTVestlendingenIE(InfoExtractor): def _real_extract(self, url): return self.url_result('xstream:btno:%s' % self._match_id(url), 'Xstream') - -