Skip to content

Commit

Permalink
Merge pull request #94 from rg3/master
Browse files Browse the repository at this point in the history
[pull] master from rg3:master
  • Loading branch information
pull[bot] committed Jan 28, 2019
2 parents 70c0a0d + 1397a79 commit f16faee
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions youtube_dl/postprocessor/ffmpeg.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ def run_ffmpeg_multiple_files(self, input_paths, out_path, opts):
encodeFilename(self._ffmpeg_filename_argument(path), True)
])
cmd = ([encodeFilename(self.executable, True), encodeArgument('-y')] +
['-loglevel', 'repeat+info'] +
files_cmd +
[encodeArgument(o) for o in opts] +
[encodeFilename(self._ffmpeg_filename_argument(out_path), True)])
Expand Down Expand Up @@ -407,6 +408,9 @@ def run(self, information):
# Don't copy the existing subtitles, we may be running the
# postprocessor a second time
'-map', '-0:s',
# Don't copy Apple TV chapters track, bin_data (see #19042, #19024,
# https://trac.ffmpeg.org/ticket/6016)
'-map', '-0:d',
]
if information['ext'] == 'mp4':
opts += ['-c:s', 'mov_text']
Expand Down

0 comments on commit f16faee

Please sign in to comment.