From: corone17 Date: Wed, 22 Jul 2015 20:38:04 +0000 (+0200) Subject: Undo adaptive -> flash workaround X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=a8b7b26068fa8de9983ffef995ea6cd4fd3ce90a;p=youtube-dl.git Undo adaptive -> flash workaround For a couple of days now rtlXL's non-DRM adaptive (m3u8) streams don't work anymore. By undoing the adaptive -> flash workaround youtube-dl returns the DRM streams again. Too bad for foreigners (geoblock). The progressive streams still work fine. --- diff --git a/youtube_dl/extractor/rtlnl.py b/youtube_dl/extractor/rtlnl.py index e0c530d64..518f7a7b4 100644 --- a/youtube_dl/extractor/rtlnl.py +++ b/youtube_dl/extractor/rtlnl.py @@ -86,12 +86,12 @@ class RtlNlIE(InfoExtractor): # NB: nowadays, recent ffmpeg and avconv can handle these encrypted streams, so # this adaptive -> flash workaround is not required in general, but it also # allows bypassing georestriction therefore is retained for now. - videopath = material['videopath'].replace('/adaptive/', '/flash/') + videopath = material['videopath'] m3u8_url = meta.get('videohost', 'http://manifest.us.rtl.nl') + videopath formats = self._extract_m3u8_formats(m3u8_url, uuid, ext='mp4') - video_urlpart = videopath.split('/flash/')[1][:-5] + video_urlpart = videopath.split('/adaptive/')[1][:-5] PG_URL_TEMPLATE = 'http://pg.us.rtl.nl/rtlxl/network/%s/progressive/%s.mp4' formats.extend([