projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[lifenews] Add test for #5660
[youtube-dl]
/
youtube_dl
/
postprocessor
/
ffmpeg.py
diff --git
a/youtube_dl/postprocessor/ffmpeg.py
b/youtube_dl/postprocessor/ffmpeg.py
index 1765f4969320d8ddcb5e8cceed4d0ee0b4a1ad02..214de39f9aa80e6f042b63e2069ded1ab6d123bd 100644
(file)
--- a/
youtube_dl/postprocessor/ffmpeg.py
+++ b/
youtube_dl/postprocessor/ffmpeg.py
@@
-501,8
+501,8
@@
class FFmpegEmbedSubtitlePP(FFmpegPostProcessor):
return cls._lang_map.get(code[:2])
def run(self, information):
return cls._lang_map.get(code[:2])
def run(self, information):
- if information['ext']
!= 'mp4'
:
- self._downloader.to_screen('[ffmpeg] Subtitles can only be embedded in mp4 files')
+ if information['ext']
not in ['mp4', 'mkv']
:
+ self._downloader.to_screen('[ffmpeg] Subtitles can only be embedded in mp4
or mkv
files')
return [], information
subtitles = information.get('requested_subtitles')
if not subtitles:
return [], information
subtitles = information.get('requested_subtitles')
if not subtitles:
@@
-520,8
+520,9
@@
class FFmpegEmbedSubtitlePP(FFmpegPostProcessor):
# Don't copy the existing subtitles, we may be running the
# postprocessor a second time
'-map', '-0:s',
# Don't copy the existing subtitles, we may be running the
# postprocessor a second time
'-map', '-0:s',
- '-c:s', 'mov_text',
]
]
+ if information['ext'] == 'mp4':
+ opts += ['-c:s', 'mov_text']
for (i, lang) in enumerate(sub_langs):
opts.extend(['-map', '%d:0' % (i + 1)])
lang_code = self._conver_lang_code(lang)
for (i, lang) in enumerate(sub_langs):
opts.extend(['-map', '%d:0' % (i + 1)])
lang_code = self._conver_lang_code(lang)