From: Philipp Hagemeister Date: Sat, 10 Jan 2015 05:10:18 +0000 (+0100) Subject: Merge remote-tracking branch 'ivan/muxed-mtime' X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=43bc88903d0665c42f205bddd0a2f5017581e8be;p=youtube-dl Merge remote-tracking branch 'ivan/muxed-mtime' --- 43bc88903d0665c42f205bddd0a2f5017581e8be diff --cc youtube_dl/postprocessor/ffmpeg.py index 6e9194fa6,d44de84cf..8bf5bebc3 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@@ -82,12 -76,12 +82,14 @@@ class FFmpegPostProcessor(PostProcessor def run_ffmpeg_multiple_files(self, input_paths, out_path, opts): self.check_version() ++ oldest_mtime = min(os.stat(path).st_mtime for path in input_paths) ++ files_cmd = [] for path in input_paths: - files_cmd.extend(['-i', encodeFilename(path, True)]) - oldest_mtime = min(os.stat(path).st_mtime for path in input_paths) - cmd = ([self._executable, '-y'] + files_cmd - + [encodeArgument(o) for o in opts] + + files_cmd.extend([encodeArgument('-i'), encodeFilename(path, True)]) + cmd = ([encodeFilename(self._executable, True), encodeArgument('-y')] + - files_cmd - + [encodeArgument(o) for o in opts] + ++ files_cmd + ++ [encodeArgument(o) for o in opts] + [encodeFilename(self._ffmpeg_filename_argument(out_path), True)]) if self._downloader.params.get('verbose', False):