diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-01-17 14:48:15 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-01-17 14:48:15 +0100 |
| commit | e2b944cf4342a1920da4ec99e2d0e5f5dcf11cc1 (patch) | |
| tree | 5a0505245aa8d6be95ec601c110c643c611d6b57 | |
| parent | 3ec05685f73187e974c0304936fb4f5e057dc2f9 (diff) | |
| parent | e103fd46ca48a92de653dfa94301928856c22c82 (diff) | |
| download | youtube-dl-e2b944cf4342a1920da4ec99e2d0e5f5dcf11cc1.tar.gz youtube-dl-e2b944cf4342a1920da4ec99e2d0e5f5dcf11cc1.tar.xz youtube-dl-e2b944cf4342a1920da4ec99e2d0e5f5dcf11cc1.zip | |
Merge branch 'master' of github.com:rg3/youtube-dl
| -rw-r--r-- | youtube_dl/postprocessor/ffmpeg.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index 8c19ed7fa..c22f2cdc6 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -479,6 +479,7 @@ class FFmpegMergerPP(FFmpegPostProcessor): def run(self, info): filename = info['filepath'] args = ['-c', 'copy'] + self._downloader.to_screen(u'[ffmpeg] Merging formats into "%s"' % filename) self.run_ffmpeg_multiple_files(info['__files_to_merge'], filename, args) return True, info |