diff options
| author | Tom-Oliver Heidel <github@tom-oliver.eu> | 2020-11-04 21:51:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 21:51:52 +0100 |
| commit | 123049d1ce93d49350d68f3ed591569be51f081c (patch) | |
| tree | c74f1165bb89ba344164c014ba65c294eb4721f7 | |
| parent | f8ddb38977abc7858543a1187d8464d5ac1c15d8 (diff) | |
| parent | 503d4a44f65146a63bf1bd5c04ac510a04fe0d33 (diff) | |
| download | hypervideo-pre-123049d1ce93d49350d68f3ed591569be51f081c.tar.lz hypervideo-pre-123049d1ce93d49350d68f3ed591569be51f081c.tar.xz hypervideo-pre-123049d1ce93d49350d68f3ed591569be51f081c.zip | |
Merge pull request #120 from pukkandan/no-embed-livechat
Don't try to embed/convert json subtitles generated by youtube livechat
| -rw-r--r-- | youtube_dlc/postprocessor/ffmpeg.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/youtube_dlc/postprocessor/ffmpeg.py b/youtube_dlc/postprocessor/ffmpeg.py index 5e85f4eeb..c38db3143 100644 --- a/youtube_dlc/postprocessor/ffmpeg.py +++ b/youtube_dlc/postprocessor/ffmpeg.py @@ -412,7 +412,9 @@ class FFmpegEmbedSubtitlePP(FFmpegPostProcessor): for lang, sub_info in subtitles.items(): sub_ext = sub_info['ext'] - if ext != 'webm' or ext == 'webm' and sub_ext == 'vtt': + if sub_ext == 'json': + self._downloader.to_screen('[ffmpeg] JSON subtitles cannot be embedded') + elif ext != 'webm' or ext == 'webm' and sub_ext == 'vtt': sub_langs.append(lang) sub_filenames.append(subtitles_filename(filename, lang, sub_ext, ext)) else: @@ -643,13 +645,18 @@ class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor): self._downloader.to_screen( '[ffmpeg] Subtitle file for %s is already in the requested format' % new_ext) continue + elif ext == 'json': + self._downloader.to_screen( + '[ffmpeg] You have requested to convert json subtitles into another format, ' + 'which is currently not possible') + continue old_file = subtitles_filename(filename, lang, ext, info.get('ext')) sub_filenames.append(old_file) new_file = subtitles_filename(filename, lang, new_ext, info.get('ext')) if ext in ('dfxp', 'ttml', 'tt'): self._downloader.report_warning( - 'You have requested to convert dfxp (TTML) subtitles into another format, ' + '[ffmpeg] You have requested to convert dfxp (TTML) subtitles into another format, ' 'which results in style information loss') dfxp_file = old_file |