From 16d46b732f49a9183ce6659e4a7ba2183c1fdab8 Mon Sep 17 00:00:00 2001 From: Mark Lee Date: Mon, 1 Dec 2014 19:10:45 -0800 Subject: [PATCH] Fix merge error --- youtube_dl/postprocessor/ffmpeg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index 2f3246d89..45bc2121c 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -86,7 +86,7 @@ class FFmpegPostProcessor(PostProcessor): files_cmd = [] for path in input_paths: files_cmd.extend(['-i', encodeFilename(path, True)]) - cmd = ([self._get_executable(), '-y'] + + cmd = ([self._executable, '-y'] + self._encode_opts(input_opts) + files_cmd + self._encode_opts(opts) + [encodeFilename(self._ffmpeg_filename_argument(out_path), True)])