diff options
| author | Sergey M․ <dstftw@gmail.com> | 2019-01-30 06:15:23 +0700 | 
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2019-01-30 06:15:23 +0700 | 
| commit | ce52c7c111602f41d7f9c498f2915fd255ba2eab (patch) | |
| tree | 4e6aca2e4e67aaa242679c0fd67f7a7bbb16d419 | |
| parent | 1063b4c7073ce056f694b1690dd5d5a1a06fb347 (diff) | |
[postprocessor/ffmpeg] Fix avconv processing broken in #19025 (closes #19067)
| -rw-r--r-- | youtube_dl/postprocessor/ffmpeg.py | 12 | 
1 files changed, 7 insertions, 5 deletions
diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index 88b9ae9be..5bcb00ac0 100644 --- 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))  | 
