diff options
| author | rzhxeo <rzhxeot7z81b4700@mailcatch.com> | 2013-11-18 00:27:06 +0100 |
|---|---|---|
| committer | rzhxeo <rzhxeot7z81b4700@mailcatch.com> | 2013-11-18 00:27:06 +0100 |
| commit | 2b35c9ef742bf261078ea10c6c0bba848db1a0df (patch) | |
| tree | fe80c838c7529c8cab6f1b44d730a2849cd68c48 /youtube_dl/extractor/cinemassacre.py | |
| parent | 4894fe8c5baec8b1f21ac6fdebe08175abc7f094 (diff) | |
| parent | 73c566695fac926e7e9e6922fe4e6d82c64a1850 (diff) | |
| download | youtube-dl-2b35c9ef742bf261078ea10c6c0bba848db1a0df.tar.gz youtube-dl-2b35c9ef742bf261078ea10c6c0bba848db1a0df.tar.xz youtube-dl-2b35c9ef742bf261078ea10c6c0bba848db1a0df.zip | |
Merge branch 'master' into rtmpdump
Conflicts: youtube_dl/FileDownloader.py Merge
Diffstat (limited to 'youtube_dl/extractor/cinemassacre.py')
| -rw-r--r-- | youtube_dl/extractor/cinemassacre.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/youtube_dl/extractor/cinemassacre.py b/youtube_dl/extractor/cinemassacre.py index 2fe1033f0..f0d08cebf 100644 --- a/youtube_dl/extractor/cinemassacre.py +++ b/youtube_dl/extractor/cinemassacre.py @@ -41,7 +41,7 @@ class CinemassacreIE(InfoExtractor): webpage_url = u'http://' + mobj.group('url') webpage = self._download_webpage(webpage_url, None) # Don't know video id yet video_date = mobj.group('date_Y') + mobj.group('date_m') + mobj.group('date_d') - mobj = re.search(r'src="(?P<embed_url>http://player\.screenwavemedia\.com/play/(?:embed|player)\.php\?id=(?:Cinemassacre-)?(?P<video_id>.+?))"', webpage) + mobj = re.search(r'src="(?P<embed_url>http://player\.screenwavemedia\.com/play/[a-zA-Z]+\.php\?id=(?:Cinemassacre-)?(?P<video_id>.+?))"', webpage) if not mobj: raise ExtractorError(u'Can\'t extract embed url and video id') playerdata_url = mobj.group(u'embed_url') @@ -65,6 +65,7 @@ class CinemassacreIE(InfoExtractor): { 'url': url, 'play_path': 'mp4:' + sd_file, + 'rtmp_live': True, # workaround 'ext': 'flv', 'format': 'sd', 'format_id': 'sd', @@ -72,6 +73,7 @@ class CinemassacreIE(InfoExtractor): { 'url': url, 'play_path': 'mp4:' + hd_file, + 'rtmp_live': True, # workaround 'ext': 'flv', 'format': 'hd', 'format_id': 'hd', |