From: Rogério Brito <rbrito@ime.usp.br>
Date: Fri, 25 Feb 2011 23:08:12 +0000 (-0300)
Subject: Merge branch 'master' into vimeo
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=cb25a0e30c27f8735deac20eec213101e0c5e29c;p=youtube-dl

Merge branch 'master' into vimeo
---

cb25a0e30c27f8735deac20eec213101e0c5e29c
diff --cc youtube-dl
index 782372688,072a91970..9ce89aaf0
--- a/youtube-dl
+++ b/youtube-dl
@@@ -2921,9 -2893,11 +3010,12 @@@ if __name__ == '__main__'
  				raise ValueError
  		except (TypeError, ValueError), err:
  			parser.error(u'invalid playlist end number specified')
+ 		if opts.extractaudio:
+ 			if opts.audioformat not in ['best', 'aac', 'mp3']:
+ 				parser.error(u'invalid audio format specified')
  
  		# Information extractors
 +		vimeo_ie = VimeoIE()
  		youtube_ie = YoutubeIE()
  		metacafe_ie = MetacafeIE(youtube_ie)
  		dailymotion_ie = DailymotionIE()