diff options
Diffstat (limited to 'youtube_dl/postprocessor/ffmpeg.py')
| -rw-r--r-- | youtube_dl/postprocessor/ffmpeg.py | 11 | 
1 files changed, 6 insertions, 5 deletions
| diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index 48f86e21c..d3d9d4f1d 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -483,6 +483,7 @@ class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor):              self._downloader.to_screen('[ffmpeg] There aren\'t any subtitles to convert')              return [], info          self._downloader.to_screen('[ffmpeg] Converting subtitles') +        sub_filenames = []          for lang, sub in subs.items():              ext = sub['ext']              if ext == new_ext: @@ -490,6 +491,8 @@ class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor):                      '[ffmpeg] Subtitle file for %s is already in the requested'                      'format' % new_ext)                  continue +            old_file = subtitles_filename(filename, lang, ext) +            sub_filenames.append(old_file)              new_file = subtitles_filename(filename, lang, new_ext)              if ext == 'dfxp' or ext == 'ttml': @@ -497,7 +500,7 @@ class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor):                      'You have requested to convert dfxp (TTML) subtitles into another format, '                      'which results in style information loss') -                dfxp_file = subtitles_filename(filename, lang, ext) +                dfxp_file = old_file                  srt_file = subtitles_filename(filename, lang, 'srt')                  with io.open(dfxp_file, 'rt', encoding='utf-8') as f: @@ -515,9 +518,7 @@ class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor):                  if new_ext == 'srt':                      continue -            self.run_ffmpeg( -                subtitles_filename(filename, lang, ext), -                new_file, ['-f', new_format]) +            self.run_ffmpeg(old_file, new_file, ['-f', new_format])              with io.open(new_file, 'rt', encoding='utf-8') as f:                  subs[lang] = { @@ -525,4 +526,4 @@ class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor):                      'data': f.read(),                  } -        return [], info +        return sub_filenames, info | 
