aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorcorone17 <reino@degeelebosch.nl>2015-07-22 22:38:04 +0200
committerSergey M․ <dstftw@gmail.com>2015-07-23 23:08:39 +0600
commita8b7b26068fa8de9983ffef995ea6cd4fd3ce90a (patch)
tree6ec566bfcd332cc5293aeec4ff48d40e66b6ebc4 /youtube_dl
parentba911137fa53737b663cb2879d357bc8a35ab558 (diff)
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.
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/rtlnl.py4
1 files changed, 2 insertions, 2 deletions
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([