Sirius/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add ability to embed subtitles in mkv files (closes #5434)

Browse source
This commit is contained in:
Nikoli 2015-04-15 20:27:40 +03:00 • committed by Jaime Marquínez Ferrándiz
parent 861e65eb05
commit 083c1bb960
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
youtube_dl/postprocessor/ffmpeg.py
View file

@ -501,8 +501,8 @@ class FFmpegEmbedSubtitlePP(FFmpegPostProcessor):
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:
@ -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',
'-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)