Merge branch 'master' into vimeo

diff --cc youtube-dl
index 7823726,072a919..9ce89aa
--- 1/youtube-dl
--- 2/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()