diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-04-21 15:24:51 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-04-21 15:24:51 +0200 |
| commit | 8be874370d36fe904bc525d9a19eaa214997baa9 (patch) | |
| tree | 981bd78338f6323d5f1eef696720b902ff3c129b | |
| parent | aec74dd95a65733d71cfdee353f075793a9a51ee (diff) | |
| parent | 68905742567e95700ffd9bd9f126b7f96b347c5c (diff) | |
| download | youtube-dl-8be874370d36fe904bc525d9a19eaa214997baa9.tar.gz youtube-dl-8be874370d36fe904bc525d9a19eaa214997baa9.tar.xz youtube-dl-8be874370d36fe904bc525d9a19eaa214997baa9.zip | |
Merge branch 'master' of github.com:rg3/youtube-dl
| -rw-r--r-- | youtube_dl/extractor/jukebox.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/rutube.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/jukebox.py b/youtube_dl/extractor/jukebox.py index f06dcb05e..9b553b9fa 100644 --- a/youtube_dl/extractor/jukebox.py +++ b/youtube_dl/extractor/jukebox.py @@ -14,7 +14,7 @@ class JukeboxIE(InfoExtractor): _VALID_URL = r'^http://www\.jukebox?\..+?\/.+[,](?P<video_id>[a-z0-9\-]+)\.html' _TEST = { 'url': 'http://www.jukebox.es/kosheen/videoclip,pride,r303r.html', - 'md5': '5dc6477e74b1e37042ac5acedd8413e5', + 'md5': '1574e9b4d6438446d5b7dbcdf2786276', 'info_dict': { 'id': 'r303r', 'ext': 'flv', diff --git a/youtube_dl/extractor/rutube.py b/youtube_dl/extractor/rutube.py index 4f7f8cb6d..357edbbda 100644 --- a/youtube_dl/extractor/rutube.py +++ b/youtube_dl/extractor/rutube.py @@ -47,7 +47,7 @@ class RutubeIE(InfoExtractor): author = video.get('author') or {} options = self._download_json( - 'http://rutube.ru/api/play/options/%s/?format=json' %video_id, + 'http://rutube.ru/api/play/options/%s/?format=json' % video_id, video_id, 'Downloading options JSON') m3u8_url = options['video_balancer'].get('m3u8') |