Merge remote-tracking branch 'jaimeMF/format_selection'

This commit is contained in:
Philipp Hagemeister
2013-10-18 00:17:03 +02:00
3 changed files with 148 additions and 8 deletions

View File

@ -235,7 +235,7 @@ def parseOpts(overrideArguments=None):
video_format.add_option('-f', '--format',
action='store', dest='format', metavar='FORMAT',
action='store', dest='format', metavar='FORMAT', default='best',
help='video format code, specifiy the order of preference using slashes: "-f 22/17/18". "-f mp4" and "-f flv" are also supported')
video_format.add_option('--all-formats',
action='store_const', dest='format', help='download all available video formats', const='all')