aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2012-04-19 09:46:01 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2012-04-19 09:46:01 +0200
commit0c24eed73a914e81f73312fad57485e404c0756b (patch)
treefcc945c287977d8f851ef7a31b66f9be1e067bc9 /youtube_dl
parent29ce2c1201bef65a8c6bb20e631a9803fc4ae775 (diff)
downloadyoutube-dl-0c24eed73a914e81f73312fad57485e404c0756b.tar.xz
merge #336
Diffstat (limited to 'youtube_dl')
-rwxr-xr-xyoutube_dl/__init__.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index bf77fb90d..375c93e74 100755
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -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'