aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorAndrei Troie <andreitroie90@gmail.com>2015-01-09 22:03:56 +0000
committerAndrei Troie <andreitroie90@gmail.com>2015-01-09 22:03:56 +0000
commitd120e9013f8dbab7e82fe1878e9b5e5e9bb94e88 (patch)
treeb7ef10d5c0d27f2cd5df733580fd4527874ed21f /youtube_dl
parent754c838903778911174e2777aebf4d1348780198 (diff)
Added an option to specify an output format for merges when downloading separate video & audio
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/options.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index feaca03a3..0ed5e3db4 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -302,6 +302,12 @@ def parseOpts(overrideArguments=None):
'--youtube-skip-dash-manifest',
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,
+ help=(
+ 'If a merge is required (e.g. bestvideo+bestaudio), output to given container format (e.g. mkv, mp4, ogg, webm, flv) '
+ 'Ignored if no merge is required'))
subtitles = optparse.OptionGroup(parser, 'Subtitle Options')
subtitles.add_option(