aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/YoutubeDL.py
diff options
context:
space:
mode:
authorAndrei Troie <andreitroie90@gmail.com>2015-01-10 00:29:06 +0000
committerAndrei Troie <andreitroie90@gmail.com>2015-01-10 00:29:06 +0000
commitd02115f83727ae0d4f394073235dc97086c64266 (patch)
tree3233cd386eae6510cd0c2b6eceb422874a1a7010 /youtube_dl/YoutubeDL.py
parent34c781a24d1cc9b424ddc3ab3c4c616f49642c6a (diff)
Use the option in preparing the merge output filename
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
-rwxr-xr-xyoutube_dl/YoutubeDL.py2
1 files changed, 1 insertions, 1 deletions
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