summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPhilipp Hagemeister <[email protected]>2015-02-09 10:44:55 +0100
committerPhilipp Hagemeister <[email protected]>2015-02-09 10:44:55 +0100
commitf7bc056b5a6a49e274c029d6f959847ee442a033 (patch)
tree317d14c43eb29ac6ee199e0983e49aa7d4bfc5d3
parenta0f719854463c6f4226e4042dfa80c1b17154e1d (diff)
parentbdb186f3b074f1f7ac0f154be419ca04241add6f (diff)
downloadyoutube-dl-f7bc056b5a6a49e274c029d6f959847ee442a033.tar.gz
youtube-dl-f7bc056b5a6a49e274c029d6f959847ee442a033.zip
Merge remote-tracking branch 'mmue/fix-rtlnow'
-rw-r--r--youtube_dl/extractor/rtlnow.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/youtube_dl/extractor/rtlnow.py b/youtube_dl/extractor/rtlnow.py
index 285c3c4be..e235f3c57 100644
--- a/youtube_dl/extractor/rtlnow.py
+++ b/youtube_dl/extractor/rtlnow.py
@@ -134,9 +134,18 @@ class RTLnowIE(InfoExtractor):
'player_url': video_page_url + 'includes/vodplayer.swf',
}
else:
- fmt = {
- 'url': filename.text,
- }
+ mobj = re.search(r'.*/(?P<hoster>[^/]+)/videos/(?P<play_path>.+)\.f4m', filename.text)
+ if mobj:
+ fmt = {
+ 'url': 'rtmpe://fmspay-fra2.rtl.de/' + mobj.group('hoster'),
+ 'play_path': 'mp4:' + mobj.group('play_path'),
+ 'page_url': url,
+ 'player_url': video_page_url + 'includes/vodplayer.swf',
+ }
+ else:
+ fmt = {
+ 'url': filename.text,
+ }
fmt.update({
'width': int_or_none(filename.get('width')),
'height': int_or_none(filename.get('height')),