commit: ce52c7c111602f41d7f9c498f2915fd255ba2eab
parent 1063b4c7073ce056f694b1690dd5d5a1a06fb347
Author: Sergey M․ <dstftw@gmail.com>
Date: Wed, 30 Jan 2019 06:15:23 +0700
[postprocessor/ffmpeg] Fix avconv processing broken in #19025 (closes #19067)
Diffstat:
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py
@@ -217,11 +217,13 @@ class FFmpegPostProcessor(PostProcessor):
encodeArgument('-i'),
encodeFilename(self._ffmpeg_filename_argument(path), True)
])
- cmd = ([encodeFilename(self.executable, True), encodeArgument('-y')] +
- [encodeArgument('-loglevel'), encodeArgument('repeat+info')] +
- files_cmd +
- [encodeArgument(o) for o in opts] +
- [encodeFilename(self._ffmpeg_filename_argument(out_path), True)])
+ cmd = [encodeFilename(self.executable, True), encodeArgument('-y')]
+ # avconv does not have repeat option
+ if self.basename == 'ffmpeg':
+ cmd += [encodeArgument('-loglevel'), encodeArgument('repeat+info')]
+ cmd += (files_cmd +
+ [encodeArgument(o) for o in opts] +
+ [encodeFilename(self._ffmpeg_filename_argument(out_path), True)])
if self._downloader.params.get('verbose', False):
self._downloader.to_screen('[debug] ffmpeg command line: %s' % shell_quote(cmd))