Browse Source

Merge branch 'master' of github.com:rg3/youtube-dl

totalwebcasting
Philipp Hagemeister 11 years ago
parent
commit
e2b944cf43
1 changed files with 1 additions and 0 deletions
  1. +1
    -0
      youtube_dl/postprocessor/ffmpeg.py

+ 1
- 0
youtube_dl/postprocessor/ffmpeg.py View File

@ -479,6 +479,7 @@ class FFmpegMergerPP(FFmpegPostProcessor):
def run(self, info): def run(self, info):
filename = info['filepath'] filename = info['filepath']
args = ['-c', 'copy'] 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) self.run_ffmpeg_multiple_files(info['__files_to_merge'], filename, args)
return True, info return True, info

Loading…
Cancel
Save