Merge pull request #6097 from dstftw/union-itags-from-multiple-dashmpd

[youtube-dl] / youtube_dl / options.py

diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index e3dfb7af93f6c7f74cd4257944df9adf6c230e67..4762e1e3c7bf1234dfa468f6f0371c781f1e5281 100644 (file)
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -351,7 +351,8 @@ def parseOpts(overrideArguments=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. One of 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')