diff options
| author | Allan Zhou <allanzp@gmail.com> | 2013-08-28 09:57:28 -0700 |
|---|---|---|
| committer | Allan Zhou <allanzp@gmail.com> | 2013-08-28 09:57:28 -0700 |
| commit | 591078babff1d783bed872c5b441dc570d354448 (patch) | |
| tree | 6cf813c993ea26eaec1d976b616d973c2bc47583 /youtube_dl/extractor/canalplus.py | |
| parent | 99859d436cdee9acc9c869254e734eba5b748260 (diff) | |
| parent | 9868c781a1bb3f50385bc7d1e87d82080ffffbc6 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'youtube_dl/extractor/canalplus.py')
| -rw-r--r-- | youtube_dl/extractor/canalplus.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/canalplus.py b/youtube_dl/extractor/canalplus.py index 3b1c88876..1f02519a0 100644 --- a/youtube_dl/extractor/canalplus.py +++ b/youtube_dl/extractor/canalplus.py @@ -5,7 +5,7 @@ from .common import InfoExtractor from ..utils import unified_strdate class CanalplusIE(InfoExtractor): - _VALID_URL = r'https?://www\.canalplus\.fr/.*?\?vid=(?P<id>\d+)' + _VALID_URL = r'https?://(www\.canalplus\.fr/.*?\?vid=|player\.canalplus\.fr/#/)(?P<id>\d+)' _VIDEO_INFO_TEMPLATE = 'http://service.canal-plus.com/video/rest/getVideosLiees/cplus/%s' IE_NAME = u'canalplus.fr' |