Merge branch 'master' into Tubepatrol

This commit is contained in:
Parmjit Virk 2017-06-06 10:29:08 -05:00
commit 735c11e27d
2 changed files with 5 additions and 2 deletions

View File

@ -15,7 +15,7 @@ class RtlNlIE(InfoExtractor):
https?://(?:www\.)? https?://(?:www\.)?
(?: (?:
rtlxl\.nl/[^\#]*\#!/[^/]+/| rtlxl\.nl/[^\#]*\#!/[^/]+/|
rtl\.nl/system/videoplayer/(?:[^/]+/)+(?:video_)?embed\.html\b.+?\buuid= rtl\.nl/(?:system/videoplayer/(?:[^/]+/)+(?:video_)?embed\.html\b.+?\buuid=|video/)
) )
(?P<id>[0-9a-f-]+)''' (?P<id>[0-9a-f-]+)'''
@ -70,6 +70,9 @@ class RtlNlIE(InfoExtractor):
}, { }, {
'url': 'http://rtlxl.nl/?_ga=1.204735956.572365465.1466978370#!/rtl-nieuws-132237/3c487912-023b-49ac-903e-2c5d79f8410f', 'url': 'http://rtlxl.nl/?_ga=1.204735956.572365465.1466978370#!/rtl-nieuws-132237/3c487912-023b-49ac-903e-2c5d79f8410f',
'only_matching': True, 'only_matching': True,
}, {
'url': 'https://www.rtl.nl/video/c603c9c2-601d-4b5e-8175-64f1e942dc7d/',
'only_matching': True,
}] }]
def _real_extract(self, url): def _real_extract(self, url):

View File

@ -48,7 +48,7 @@ class TVPlayerIE(InfoExtractor):
'https://tvplayer.com/watch/context', display_id, 'https://tvplayer.com/watch/context', display_id,
'Downloading JSON context', query={ 'Downloading JSON context', query={
'resource': resource_id, 'resource': resource_id,
'nonce': token, 'gen': token,
}) })
validate = context['validate'] validate = context['validate']