diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-01-10 01:59:14 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-01-10 01:59:14 +0100 |
| commit | 45598f15788568a8432da19544e5bdc390032aca (patch) | |
| tree | e0c41e910eb267c6ef254f8d47cc36f32d5663ac /youtube_dl/options.py | |
| parent | 130239460370870c33f259ed1549878388996d3f (diff) | |
| parent | d02115f83727ae0d4f394073235dc97086c64266 (diff) | |
| download | youtube-dl-45598f15788568a8432da19544e5bdc390032aca.tar.xz | |
Merge remote-tracking branch 'aft90/merge-output-format'
Conflicts:
youtube_dl/YoutubeDL.py
Diffstat (limited to 'youtube_dl/options.py')
| -rw-r--r-- | youtube_dl/options.py | 6 |
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( |