X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2F__init__.py;h=659a92a3b944c25f40e2ad86aa43f9db37fbfe9a;hb=121c09c7be1ac2944f3432122104c1952bfd1f04;hp=b4ae35a2ba901f4f25325b204740de9e5df91a6f;hpb=34c781a24d1cc9b424ddc3ab3c4c616f49642c6a;p=youtube-dl

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index b4ae35a2b..659a92a3b 100644
--- 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:
@@ -328,6 +326,7 @@ def _real_main(argv=None):
         'extract_flat': opts.extract_flat,
         'merge_output_format': opts.merge_output_format,
         'postprocessors': postprocessors,
+        'fixup': opts.fixup,
     }
 
     with YoutubeDL(ydl_opts) as ydl: