projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cbbece9
)
Typo "incompatible" instead of "uncompatible"
author
zouhair
<zouhair@users.noreply.github.com>
Wed, 29 Apr 2015 14:07:49 +0000
(10:07 -0400)
committer
zouhair
<zouhair@users.noreply.github.com>
Wed, 29 Apr 2015 14:07:49 +0000
(10:07 -0400)
youtube_dl/YoutubeDL.py
patch
|
blob
|
history
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index 977141881b07f7a81acae4887369bb6bd9aec09e..827c88e0d9ebb3821d2c4e6a5ec38a0c90c390ba 100755
(executable)
--- 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
u
ncompatible for merge. '
+ self.report_warning('You have requested formats
i
ncompatible for merge. '
'The formats will be merged into mkv')
if os.path.exists(encodeFilename(filename)):
self.to_screen(