]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Use the option in preparing the merge output filename
authorAndrei Troie <andreitroie90@gmail.com>
Sat, 10 Jan 2015 00:29:06 +0000 (00:29 +0000)
committerAndrei Troie <andreitroie90@gmail.com>
Sat, 10 Jan 2015 00:29:06 +0000 (00:29 +0000)
youtube_dl/YoutubeDL.py

index 24d6c2de7670d2139259d1cdd5a068e81f5f0bb3..6d5c401dfa3418350d03105e3efe537cecc7d911 100755 (executable)
@@ -912,7 +912,7 @@ class YoutubeDL(object):
                             selected_format = {
                                 'requested_formats': formats_info,
                                 'format': rf,
-                                'ext': formats_info[0]['ext'],
+                                'ext': self.params['merge_output_format'] if self.params['merge_output_format'] is not None else formats_info[0]['ext'],
                             }
                         else:
                             selected_format = None