projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
88c86d2
)
Fixed the ustream extractor to use the current ustream API
author
David Rabinowitz
<drabinowitz@agtinternational.com>
Thu, 1 Oct 2015 09:07:27 +0000
(12:07 +0300)
committer
Sergey M․
<dstftw@gmail.com>
Mon, 5 Oct 2015 16:30:14 +0000
(22:30 +0600)
youtube_dl/extractor/ustream.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/ustream.py
b/youtube_dl/extractor/ustream.py
index c39c278ab211c45809e594f64cc90f71304e9d92..18add908e8e667f3aef2f823e7edf265a373e577 100644
(file)
--- a/
youtube_dl/extractor/ustream.py
+++ b/
youtube_dl/extractor/ustream.py
@@
-52,17
+52,12
@@
class UstreamIE(InfoExtractor):
desktop_url = 'http://www.ustream.tv/recorded/' + desktop_video_id
return self.url_result(desktop_url, 'Ustream')
desktop_url = 'http://www.ustream.tv/recorded/' + desktop_video_id
return self.url_result(desktop_url, 'Ustream')
- params = self._download_json(
- 'http://cdngw.ustream.tv/rgwjson/Viewer.getVideo/' + json.dumps({
- 'brandId': 1,
- 'videoId': int(video_id),
- 'autoplay': False,
- }), video_id)
+ params = self._download_json('https://api.ustream.tv/videos/' + video_id + '.json', video_id)
if 'error' in params:
raise ExtractorError(params['error']['message'], expected=True)
if 'error' in params:
raise ExtractorError(params['error']['message'], expected=True)
- video_url = params['flv']
+ video_url = params['
video']['media_urls']['
flv']
webpage = self._download_webpage(url, video_id)
webpage = self._download_webpage(url, video_id)