From 49f0da7ae1ec292132477730f0eba242ad52b6e2 Mon Sep 17 00:00:00 2001 From: Naglis Jonaitis Date: Sat, 22 Nov 2014 21:06:45 +0200 Subject: [PATCH] [rtlxl] Use unencrypted m3u8 streams (#4115) --- youtube_dl/extractor/rtlnl.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/youtube_dl/extractor/rtlnl.py b/youtube_dl/extractor/rtlnl.py index 5daef2fc5..4a188e5d4 100644 --- a/youtube_dl/extractor/rtlnl.py +++ b/youtube_dl/extractor/rtlnl.py @@ -28,9 +28,8 @@ def _real_extract(self, url): 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/d=pc/fmt=adaptive/' % uuid, + 'http://www.rtl.nl/system/s4m/vfd/version=2/uuid=%s/fmt=flash/' % uuid, uuid) material = info['material'][0] @@ -39,12 +38,13 @@ def _real_extract(self, url): progname = info['abstracts'][0]['name'] subtitle = material['title'] or info['episodes'][0]['name'] - videopath = material['videopath'] + # Use unencrypted m3u8 streams (See https://github.com/rg3/youtube-dl/issues/4118) + videopath = material['videopath'].replace('.f4m', '.m3u8') m3u8_url = 'http://manifest.us.rtl.nl' + videopath formats = self._extract_m3u8_formats(m3u8_url, uuid, ext='mp4') - video_urlpart = videopath.split('/adaptive/')[1][:-4] + video_urlpart = videopath.split('/flash/')[1][:-4] PG_URL_TEMPLATE = 'http://pg.us.rtl.nl/rtlxl/network/%s/progressive/%s.mp4' formats.extend([