X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2F__init__.py;h=568c5e6d061406cbd9f8834dba1a23a2fdcd1ac4;hb=bd2d82a5d3f119644d125e0b0a71dca738733fb4;hp=4db97ad3c20e2f17ce5f9376fe9b7dd1487edc97;hpb=ba7678f9cc1099313f3fa9221538116a24e8e627;p=youtube-dl.git

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 4db97ad3c..568c5e6d0 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -256,8 +256,8 @@ def parseOpts(overrideArguments=None):
 
 
     video_format.add_option('-f', '--format',
-            action='store', dest='format', metavar='FORMAT', default='best',
-            help='video format code, specify the order of preference using slashes: "-f 22/17/18". "-f mp4" and "-f flv" are also supported. You can also use the special names "best", "bestaudio", and "worst"')
+            action='store', dest='format', metavar='FORMAT', default=None,
+            help='video format code, specify the order of preference using slashes: "-f 22/17/18". "-f mp4" and "-f flv" are also supported. You can also use the special names "best", "bestaudio", "worst", and "worstaudio"')
     video_format.add_option('--all-formats',
             action='store_const', dest='format', help='download all available video formats', const='all')
     video_format.add_option('--prefer-free-formats',
@@ -624,6 +624,10 @@ def _real_main(argv=None):
     if opts.default_search not in ('auto', None) and ':' not in opts.default_search:
         parser.error(u'--default-search invalid; did you forget a colon (:) at the end?')
 
+    # Do not download videos when there are audio-only formats
+    if opts.extractaudio and not opts.keepvideo and opts.format is None:
+        opts.format = 'bestaudio/best'
+
     # --all-sub automatically sets --write-sub if --write-auto-sub is not given
     # this was the old behaviour if only --all-sub was given.
     if opts.allsubtitles and (opts.writeautomaticsub == False):