diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2012-04-19 09:44:25 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2012-04-19 09:44:25 +0200 |
| commit | 29ce2c1201bef65a8c6bb20e631a9803fc4ae775 (patch) | |
| tree | ed8b4e27ee9ffa295de1e3a867dfb68b246ce0ac | |
| parent | fff24d5e358eadea493e5781c17c476e6907c0d5 (diff) | |
| parent | 532c74ae868a15e42baefb0fdde5a753b690b0ee (diff) | |
| download | youtube-dl-29ce2c1201bef65a8c6bb20e631a9803fc4ae775.tar.xz | |
Merge git://git.jankratochvil.net/youtube-dl
| -rwxr-xr-x | youtube-dl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/youtube-dl b/youtube-dl index bf77fb90d..375c93e74 100755 --- a/youtube-dl +++ b/youtube-dl @@ -1178,8 +1178,8 @@ class YoutubeIE(InfoExtractor): _AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en' _NETRC_MACHINE = 'youtube' # Listed in order of quality - _available_formats = ['38', '37', '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 = ['38', '37', '46', '22', '45', '35', '44', '34', '18', '43', '6', '5', '17', '13'] + _available_formats_prefer_free = ['38', '46', '37', '45', '22', '44', '35', '43', '34', '18', '6', '5', '17', '13'] _video_extensions = { '13': '3gp', '17': 'mp4', @@ -1190,6 +1190,7 @@ class YoutubeIE(InfoExtractor): '43': 'webm', '44': 'webm', '45': 'webm', + '46': 'webm', } _video_dimensions = { '5': '240x400', @@ -1205,6 +1206,7 @@ class YoutubeIE(InfoExtractor): '43': '360x640', '44': '480x854', '45': '720x1280', + '46': '1080x1920', } IE_NAME = u'youtube' |