From: Andrei Troie <andreitroie90@gmail.com>
Date: Fri, 9 Jan 2015 22:03:56 +0000 (+0000)
Subject: Added an option to specify an output format for merges when downloading separate... 
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=d120e9013f8dbab7e82fe1878e9b5e5e9bb94e88;p=youtube-dl

Added an option to specify an output format for merges when downloading separate video & audio
---

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(