aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/options.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2015-01-10 02:03:00 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2015-01-10 02:03:00 +0100
commitbd1a281ede1548ae0f0c74360eb518751c2a4526 (patch)
tree1976d14f2df80e8d2e3598822d9e4c1bc1e6339d /youtube_dl/options.py
parent45598f15788568a8432da19544e5bdc390032aca (diff)
[options] PEP8 and simpler --merge-output-format handling (#4673)
Diffstat (limited to 'youtube_dl/options.py')
-rw-r--r--youtube_dl/options.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index 0ed5e3db4..14006178d 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -303,10 +303,10 @@ def parseOpts(overrideArguments=None):
action='store_false', dest='youtube_include_dash_manifest',
help='Do not download the DASH manifest on YouTube videos')
video_format.add_option(
- '--merge-output-format',
- action='store', dest='merge_output_format', metavar='FORMAT' ,default=None,
+ '--merge-output-format',
+ action='store', dest='merge_output_format', metavar='FORMAT', default=None,
help=(
- 'If a merge is required (e.g. bestvideo+bestaudio), output to given container format (e.g. mkv, mp4, ogg, webm, flv) '
+ 'If a merge is required (e.g. bestvideo+bestaudio), output to given container format. One of mkv, mp4, ogg, webm, flv.'
'Ignored if no merge is required'))
subtitles = optparse.OptionGroup(parser, 'Subtitle Options')