[golem] Don't omit positional argument specifiers

[youtube-dl.git] / youtube_dl / options.py

diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index d8c161c9e44c887cdc85d6e337982a1de3404b65..44dcb1e34fa9eca6b95c42e85433fec88fe6fd24 100644 (file)
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import os.path
 import optparse
 import shlex
@@ -216,7 +218,7 @@ def parseOpts(overrideArguments=None):
 
     video_format.add_option('-f', '--format',
             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", "bestvideo", "bestaudio", "worst", "worstvideo" and "worstaudio". By default, youtube-dl will pick the best quality.')
+            help='video format code, specify the order of preference using slashes: -f 22/17/18 .  -f mp4 , -f m4a and  -f flv  are also supported. You can also use the special names "best", "bestvideo", "bestaudio", "worst", "worstvideo" and "worstaudio". By default, youtube-dl will pick the best quality. Use commas to download multiple audio formats, such as  -f  136/137/mp4/bestvideo,140/m4a/bestaudio')
     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',