From: Andrei Troie <andreitroie90@gmail.com>
Date: Sat, 10 Jan 2015 00:29:06 +0000 (+0000)
Subject: Use the option in preparing the merge output filename
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=d02115f83727ae0d4f394073235dc97086c64266;p=youtube-dl

Use the option in preparing the merge output filename
---

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 24d6c2de7..6d5c401df 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -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