Merge pull request #5552 from zouhair/master

Typo "incompatible" instead of "uncompatible"
This commit is contained in:
Sergey M. 2015-04-29 19:09:47 +05:00
commit f8690631e2

View File

@ -1384,7 +1384,7 @@ class YoutubeDL(object):
requested_formats = info_dict['requested_formats']
if self.params.get('merge_output_format') is None and not compatible_formats(requested_formats):
filename = os.path.splitext(filename)[0] + '.mkv'
self.report_warning('You have requested formats uncompatible for merge. '
self.report_warning('You have requested formats incompatible for merge. '
'The formats will be merged into mkv')
if os.path.exists(encodeFilename(filename)):
self.to_screen(