projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
754c838
)
Added an option to specify an output format for merges when downloading separate...
author
Andrei Troie
<andreitroie90@gmail.com>
Fri, 9 Jan 2015 22:03:56 +0000
(22:03 +0000)
committer
Andrei Troie
<andreitroie90@gmail.com>
Fri, 9 Jan 2015 22:03:56 +0000
(22:03 +0000)
youtube_dl/options.py
patch
|
blob
|
history
diff --git
a/youtube_dl/options.py
b/youtube_dl/options.py
index feaca03a3a461f70c933b1fa228bcd09d45078dd..0ed5e3db47db8cd490eecc81109148ca1370646f 100644
(file)
--- 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')
'--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(
subtitles = optparse.OptionGroup(parser, 'Subtitle Options')
subtitles.add_option(