R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge error

Browse Source
This commit is contained in:
Mark Lee 2014-12-01 19:10:45 -08:00
parent 1037943c8f
commit 16d46b732f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/postprocessor/ffmpeg.py
View File

@ -86,7 +86,7 @@ class FFmpegPostProcessor(PostProcessor):
files_cmd = [] files_cmd = []
for path in input_paths: for path in input_paths:
files_cmd.extend(['-i', encodeFilename(path, True)]) 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) + self._encode_opts(input_opts) + files_cmd + self._encode_opts(opts) +
[encodeFilename(self._ffmpeg_filename_argument(out_path), True)]) [encodeFilename(self._ffmpeg_filename_argument(out_path), True)])