aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/canalplus.py
diff options
context:
space:
mode:
authorIsmael Mejia <iemejia@gmail.com>2013-09-06 23:23:23 +0200
committerIsmael Mejia <iemejia@gmail.com>2013-09-06 23:24:41 +0200
commit72836fcee453386f4f16325c5b8fa4c1ba1bb442 (patch)
tree58efd36f4a56269a07774969e2ac385aacf8eae6 /youtube_dl/extractor/canalplus.py
parentd6e203b3dcef8f291b57021903e629d3e30e1f0b (diff)
parenta7130543fa0368175740f5fa173ef920671db866 (diff)
Merge branch 'master' into subtitles_rework
Diffstat (limited to 'youtube_dl/extractor/canalplus.py')
-rw-r--r--youtube_dl/extractor/canalplus.py2
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'