Skip to content

Commit

Permalink
Revert "[ffmpeg] Fix embedding subtitles (#9063)"
Browse files Browse the repository at this point in the history
This reverts commit ccff2c4.

Fixes #10081.

The new approach breaks embedding subtitles into video-only or
audio-only files. FFMpeg provides a trick: add '?' after the argument of
'-map' so that a missing stream is ignored. For example:

opts = [
    '-map', '0:v?',
    '-c:v', 'copy',
    '-map', '0:a?',
    '-c:a', 'copy',
    # other options...
]

Unfortunately, such a format is not implemented in avconv, either.
I guess adding '-ignore_unknown' if self.basename == 'ffmpeg' is the
best solution. However, the example mentioned in #9063 no longer serves
problematic files, so I can't test it. I'll reopen #9063 and wait for
another example so that I can test '-ignore_unknown'.
  • Loading branch information
Yen Chi Hsuan committed Jul 15, 2016
1 parent 224db03 commit 23495d6
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions youtube_dl/postprocessor/ffmpeg.py
Original file line number Diff line number Diff line change
Expand Up @@ -363,10 +363,8 @@ def run(self, information):
input_files = [filename] + sub_filenames

opts = [
'-map', '0:v',
'-c:v', 'copy',
'-map', '0:a',
'-c:a', 'copy',
'-map', '0',
'-c', 'copy',
# Don't copy the existing subtitles, we may be running the
# postprocessor a second time
'-map', '-0:s',
Expand Down

0 comments on commit 23495d6

Please sign in to comment.