github-com-ytdl-org/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-01-07 17:16:08 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'mmue/fix-rtlnow'

Browse source
This commit is contained in:
Philipp Hagemeister 2015-02-09 10:44:55 +01:00
parent a0f7198544 bdb186f3b0
commit f7bc056b5a
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
youtube_dl/extractor/rtlnow.py
View file

@ -134,9 +134,18 @@ class RTLnowIE(InfoExtractor):
'player_url': video_page_url + 'includes/vodplayer.swf', 'player_url': video_page_url + 'includes/vodplayer.swf',
} }
else: else:
fmt = { mobj = re.search(r'.*/(?P<hoster>[^/]+)/videos/(?P<play_path>.+)\.f4m', filename.text)
'url': 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({ fmt.update({
'width': int_or_none(filename.get('width')), 'width': int_or_none(filename.get('width')),
'height': int_or_none(filename.get('height')), 'height': int_or_none(filename.get('height')),