diff options
author | Pierre Rudloff <contact@rudloff.pro> | 2013-08-27 10:47:47 +0200 |
---|---|---|
committer | Pierre Rudloff <contact@rudloff.pro> | 2013-08-27 10:47:47 +0200 |
commit | c5b921b5975f84ec31077cf5333f14736efe40b6 (patch) | |
tree | ff9e73e29d547543aff3e7b57ae7f7f10212c806 /youtube_dl/extractor/canalplus.py | |
parent | 7a20e2e1f8ff0893e239aa2d855d8a00a510d769 (diff) | |
parent | e86ea47c029c1f95a696e43df7bea2e3e617fbc3 (diff) | |
download | hypervideo-pre-c5b921b5975f84ec31077cf5333f14736efe40b6.tar.lz hypervideo-pre-c5b921b5975f84ec31077cf5333f14736efe40b6.tar.xz hypervideo-pre-c5b921b5975f84ec31077cf5333f14736efe40b6.zip |
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' |