youtube-dl

commit 2761012f69f063c65dce35f5667fdbeedad6837e
parent 3de2a1e63595741f7b7ea19b7ead7b212bf4d42f
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Fri, 30 Sep 2011 09:07:36 +0200

Cosmetic changes to --list-formats

Diffstat:
M
README.md
 | 
1
+
M
youtube-dl
 | 
6
+++---

2 files changed, 4 insertions(+), 3 deletions(-)
diff --git 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
@@ -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',