mirrors/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Philipp Hagemeister
2014-04-21 15:24:51 +02:00
parent aec74dd95a 6890574256
commit 8be874370d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/extractor/jukebox.py
View File

@@ -14,7 +14,7 @@ class JukeboxIE(InfoExtractor):
_VALID_URL = r'^http://www\.jukebox?\..+?\/.+[,](?P<video_id>[a-z0-9\-]+)\.html' _VALID_URL = r'^http://www\.jukebox?\..+?\/.+[,](?P<video_id>[a-z0-9\-]+)\.html'
_TEST = { _TEST = {
'url': 'http://www.jukebox.es/kosheen/videoclip,pride,r303r.html', 'url': 'http://www.jukebox.es/kosheen/videoclip,pride,r303r.html',
'md5': '5dc6477e74b1e37042ac5acedd8413e5', 'md5': '1574e9b4d6438446d5b7dbcdf2786276',
'info_dict': { 'info_dict': {
'id': 'r303r', 'id': 'r303r',
'ext': 'flv', 'ext': 'flv',

2
youtube_dl/extractor/rutube.py
View File

@@ -47,7 +47,7 @@ class RutubeIE(InfoExtractor):
author = video.get('author') or {} author = video.get('author') or {}
options = self._download_json( 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') video_id, 'Downloading options JSON')
m3u8_url = options['video_balancer'].get('m3u8') m3u8_url = options['video_balancer'].get('m3u8')