laudom/haruhi-dl
2
0
Fork 0
Code Issues 13 Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:rg3/youtube-dl

Browse source
This commit is contained in:
Philipp Hagemeister 2014-12-11 16:23:01 +01:00
parent 45c24df512 158731f83e
commit 0daa05961b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
youtube_dl/extractor/ntv.py
View file

@ -130,7 +130,7 @@ class NTVIE(InfoExtractor):
'rtmp_conn': 'B:1', 'rtmp_conn': 'B:1',
'player_url': 'http://www.ntv.ru/swf/vps1.swf?update=20131128', 'player_url': 'http://www.ntv.ru/swf/vps1.swf?update=20131128',
'page_url': 'http://www.ntv.ru', 'page_url': 'http://www.ntv.ru',
'flash_ver': 'LNX 11,2,202,341', 'flash_version': 'LNX 11,2,202,341',
'rtmp_live': True, 'rtmp_live': True,
'ext': 'flv', 'ext': 'flv',
'filesize': int(size.text), 'filesize': int(size.text),

4
youtube_dl/extractor/tvplay.py
View file

@ -182,8 +182,8 @@ class TVPlayIE(InfoExtractor):
'http://playapi.mtgx.tv/v1/videos/%s' % video_id, video_id, 'Downloading video JSON') 'http://playapi.mtgx.tv/v1/videos/%s' % video_id, video_id, 'Downloading video JSON')
if video['is_geo_blocked']: if video['is_geo_blocked']:
raise ExtractorError( self.report_warning(
'This content is not available in your country due to copyright reasons', expected=True) 'This content might not be available in your country due to copyright reasons')
streams = self._download_json( streams = self._download_json(
'http://playapi.mtgx.tv/v1/videos/stream/%s' % video_id, video_id, 'Downloading streams JSON') 'http://playapi.mtgx.tv/v1/videos/stream/%s' % video_id, video_id, 'Downloading streams JSON')