summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Rabinowitz <drabinowitz@agtinternational.com>2015-10-01 12:07:27 +0300
committerSergey M․ <dstftw@gmail.com>2015-10-05 22:30:14 +0600
commit7fd4ed9939d7c467c61663cad7189ee8ad27c89b (patch)
tree19d2c96c09216576ef2bbb1de4fb727f9a48d4fb
parent88c86d211bd2f542625d3b91ac4b15e62995345d (diff)
downloadyoutube-dl-7fd4ed9939d7c467c61663cad7189ee8ad27c89b.tar.gz
youtube-dl-7fd4ed9939d7c467c61663cad7189ee8ad27c89b.tar.xz
youtube-dl-7fd4ed9939d7c467c61663cad7189ee8ad27c89b.zip
Fixed the ustream extractor to use the current ustream API
-rw-r--r--youtube_dl/extractor/ustream.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/youtube_dl/extractor/ustream.py b/youtube_dl/extractor/ustream.py
index c39c278ab..18add908e 100644
--- 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')
 
-        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)
 
-        video_url = params['flv']
+        video_url = params['video']['media_urls']['flv']
 
         webpage = self._download_webpage(url, video_id)