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

[postprocessor/ffmpeg] Fix avconv processing broken in #19025 (closes #19067)

Browse source
This commit is contained in:
Sergey M․ 2019-01-30 06:15:23 +07:00
parent 1063b4c707
commit ce52c7c111
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
youtube_dl/postprocessor/ffmpeg.py
View file

@ -217,11 +217,13 @@ class FFmpegPostProcessor(PostProcessor):
encodeArgument('-i'), encodeArgument('-i'),
encodeFilename(self._ffmpeg_filename_argument(path), True) encodeFilename(self._ffmpeg_filename_argument(path), True)
]) ])
cmd = ([encodeFilename(self.executable, True), encodeArgument('-y')] + cmd = [encodeFilename(self.executable, True), encodeArgument('-y')]
[encodeArgument('-loglevel'), encodeArgument('repeat+info')] + # avconv does not have repeat option
files_cmd + if self.basename == 'ffmpeg':
[encodeArgument(o) for o in opts] + cmd += [encodeArgument('-loglevel'), encodeArgument('repeat+info')]
[encodeFilename(self._ffmpeg_filename_argument(out_path), True)]) cmd += (files_cmd +
[encodeArgument(o) for o in opts] +
[encodeFilename(self._ffmpeg_filename_argument(out_path), True)])
if self._downloader.params.get('verbose', False): if self._downloader.params.get('verbose', False):
self._downloader.to_screen('[debug] ffmpeg command line: %s' % shell_quote(cmd)) self._downloader.to_screen('[debug] ffmpeg command line: %s' % shell_quote(cmd))