diff options
author | Sergey M. <dstftw@gmail.com> | 2015-04-29 19:09:47 +0500 |
---|---|---|
committer | Sergey M. <dstftw@gmail.com> | 2015-04-29 19:09:47 +0500 |
commit | f8690631e277b9075b65e07f9df42a9076ae346b (patch) | |
tree | 9e359b66576560df6c8d097b608d5f3a2c865959 | |
parent | cbbece96a25443dbf5cb66819883efa2e9b66de4 (diff) | |
parent | 5456d78f0c177bbdd3ad0b6221ff95b706104441 (diff) |
Merge pull request #5552 from zouhair/master
Typo "incompatible" instead of "uncompatible"
-rwxr-xr-x | youtube_dl/YoutubeDL.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 977141881..827c88e0d 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -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( |