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

merge upstream

Browse Source
This commit is contained in:
Filippo Valsorda
2012-05-01 18:22:08 +02:00
parent 921a145592 0c24eed73a
commit 3fe294e4ef
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
youtube_dl/InfoExtractors.py
View File

@@ -103,8 +103,8 @@ class YoutubeIE(InfoExtractor):
_NEXT_URL_RE = r'[\?&]next_url=([^&]+)' _NEXT_URL_RE = r'[\?&]next_url=([^&]+)'
_NETRC_MACHINE = 'youtube' _NETRC_MACHINE = 'youtube'
# Listed in order of quality # Listed in order of quality
_available_formats = ['38', '37', '22', '45', '35', '44', '34', '18', '43', '6', '5', '17', '13'] _available_formats = ['38', '37', '46', '22', '45', '35', '44', '34', '18', '43', '6', '5', '17', '13']
_available_formats_prefer_free = ['38', '37', '45', '22', '44', '35', '43', '34', '18', '6', '5', '17', '13'] _available_formats_prefer_free = ['38', '46', '37', '45', '22', '44', '35', '43', '34', '18', '6', '5', '17', '13']
_video_extensions = { _video_extensions = {
'13': '3gp', '13': '3gp',
'17': 'mp4', '17': 'mp4',
@@ -115,6 +115,7 @@ class YoutubeIE(InfoExtractor):
'43': 'webm', '43': 'webm',
'44': 'webm', '44': 'webm',
'45': 'webm', '45': 'webm',
'46': 'webm',
} }
_video_dimensions = { _video_dimensions = {
'5': '240x400', '5': '240x400',
@@ -130,6 +131,7 @@ class YoutubeIE(InfoExtractor):
'43': '360x640', '43': '360x640',
'44': '480x854', '44': '480x854',
'45': '720x1280', '45': '720x1280',
'46': '1080x1920',
} }
IE_NAME = u'youtube' IE_NAME = u'youtube'
@@ -2605,7 +2607,6 @@ class MixcloudIE(InfoExtractor):
url_list = jsonData[fmt][bitrate] url_list = jsonData[fmt][bitrate]
except TypeError: # we have no bitrate info. except TypeError: # we have no bitrate info.
url_list = jsonData[fmt] url_list = jsonData[fmt]
return url_list return url_list
def check_urls(self, url_list): def check_urls(self, url_list):