[options] PEP8 and simpler --merge-output-format handling (#4673)

[youtube-dl] / youtube_dl / __init__.py

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index b4ae35a2ba901f4f25325b204740de9e5df91a6f..8e7b7446663644bde08fa991c0dfcb67dfba674f 100644 (file)
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -166,9 +166,7 @@ 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: