From: Andrei Troie Date: Sat, 10 Jan 2015 00:03:11 +0000 (+0000) Subject: Passing the option into the main program's arguments X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=34c781a24d1cc9b424ddc3ab3c4c616f49642c6a;p=youtube-dl Passing the option into the main program's arguments --- diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 844992d8e..b4ae35a2b 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -166,6 +166,9 @@ def _real_main(argv=None): if opts.recodevideo is not None: if opts.recodevideo not in ['mp4', 'flv', 'webm', 'ogg', 'mkv']: parser.error('invalid video recode format specified') + if opts.merge_output_format is not None and not '+' in opts.format: #if merge format output is used on videos that don't require merging, ignore + opts.merge_output_format = None + if opts.date is not None: date = DateRange.day(opts.date) else: @@ -323,6 +326,7 @@ def _real_main(argv=None): 'encoding': opts.encoding, 'exec_cmd': opts.exec_cmd, 'extract_flat': opts.extract_flat, + 'merge_output_format': opts.merge_output_format, 'postprocessors': postprocessors, }