diff options
| author | Naglis Jonaitis <njonaitis@gmail.com> | 2014-11-19 00:26:44 +0200 |
|---|---|---|
| committer | Naglis Jonaitis <njonaitis@gmail.com> | 2014-11-19 00:26:44 +0200 |
| commit | 37eddd314319d42f509307698196e4e9a8e84c7e (patch) | |
| tree | 01d0521fe40889b4ef7e045f4808118ee3f15ed9 | |
| parent | 0857baade31dd0ce9ce220148ef914cdc63030cb (diff) | |
[rtlxl] Use m3u8 streams instead of f4m (#4115, #4118)
| -rw-r--r-- | youtube_dl/extractor/rtlnl.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/youtube_dl/extractor/rtlnl.py b/youtube_dl/extractor/rtlnl.py index 0ab1eb69c..599952512 100644 --- a/youtube_dl/extractor/rtlnl.py +++ b/youtube_dl/extractor/rtlnl.py @@ -28,8 +28,9 @@ class RtlXlIE(InfoExtractor): mobj = re.match(self._VALID_URL, url) uuid = mobj.group('uuid') + # Use m3u8 streams (see https://github.com/rg3/youtube-dl/issues/4118) info = self._download_json( - 'http://www.rtl.nl/system/s4m/vfd/version=2/uuid=%s/fmt=flash/' % uuid, + 'http://www.rtl.nl/system/s4m/vfd/version=2/uuid=%s/d=pc/fmt=adaptive/' % uuid, uuid) material = info['material'][0] @@ -39,11 +40,11 @@ class RtlXlIE(InfoExtractor): subtitle = material['title'] or info['episodes'][0]['name'] videopath = material['videopath'] - f4m_url = 'http://manifest.us.rtl.nl' + videopath + m3u8_url = 'http://manifest.us.rtl.nl' + videopath - formats = self._extract_f4m_formats(f4m_url, uuid) + formats = self._extract_m3u8_formats(m3u8_url, uuid, ext='mp4') - video_urlpart = videopath.split('/flash/')[1][:-4] + video_urlpart = videopath.split('/adaptive/')[1][:-4] PG_URL_TEMPLATE = 'http://pg.us.rtl.nl/rtlxl/network/%s/progressive/%s.mp4' formats.extend([ @@ -57,6 +58,8 @@ class RtlXlIE(InfoExtractor): } ]) + self._sort_formats(formats) + return { 'id': uuid, 'title': '%s - %s' % (progname, subtitle), |