From: Rogério Brito <rbrito@ime.usp.br>
Date: Sat, 29 Jan 2011 05:45:21 +0000 (-0200)
Subject: Merge branch 'master' into prefer-webm
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=9e1ee3364a98367a0573d0bfab80998dbb09b254;hp=6025795d952958391a2325dbdcf41a6baae8d8f4;p=youtube-dl

Merge branch 'master' into prefer-webm
---

diff --git a/youtube-dl b/youtube-dl
index 8dd03daf3..e6768acaa 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -862,7 +862,7 @@ 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', '34', '43', '18', '6', '5', '17', '13']
+	_available_formats = ['38', '37', '45', '22', '43', '35', '34', '18', '6', '5', '17', '13']
 	_video_extensions = {
 		'13': '3gp',
 		'17': 'mp4',