Cosmetic changes to --list-formats

diff --git a/README.md b/README.md
index ad0590f9983ba5890c28dd1d64881319e7b7ff11..2b0ab67eba2215b3c4d1f9189d1f2456ee03dad0 100644 (file)
--- a/README.md
+++ b/README.md
@@ -68,6 +68,7 @@ which means you can modify it, redistribute it or use it however you like.
     -f, --format FORMAT      video format code
     --all-formats            download all available video formats
     --max-quality FORMAT     highest quality format to download
+    -F, --list-formats       list all available formats (currently youtube only)
 
 ### Authentication Options:
     -u, --username USERNAME  account username

diff --git a/youtube-dl b/youtube-dl
index 09f8ddd98822db3438b3b9e47dce6252cfcb8248..3d8c18c6e564401b6a1e761e90e8c50541576d05 100755 (executable)
--- a/youtube-dl
+++ b/youtube-dl
@@ -1352,7 +1352,7 @@ class YoutubeIE(InfoExtractor):
                                return
                        if self._downloader.params.get('listformats', None):
                                self._print_formats(existing_formats)
-                               sys.exit(0)
+                               return
                        if req_format is None or req_format == 'best':
                                video_url_list = [(existing_formats[0], url_map[existing_formats[0]])] # Best quality
                        elif req_format == 'worst':
@@ -3587,8 +3587,8 @@ def parseOpts():
                        action='store_const', dest='format', help='download all available video formats', const='all')
        video_format.add_option('--max-quality',
                        action='store', dest='format_limit', metavar='FORMAT', help='highest quality format to download')
-       video_format.add_option('-L', '--list-formats',
-                       action='store_true', dest='listformats', help='list all available formats')
+       video_format.add_option('-F', '--list-formats',
+                       action='store_true', dest='listformats', help='list all available formats (currently youtube only)')
 
 
        verbosity.add_option('-q', '--quiet',