Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-13 21:57:16 +08:00
Code Issues Releases Wiki Activity

Changed comments

Browse Source
This commit is contained in:
Andrei Troie 2014-12-27 02:29:19 +02:00
parent 1605371fcb
commit 6e11a64452
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
youtube_dl/postprocessor/ffmpeg.py
View File

@ -521,10 +521,9 @@ class FFmpegMergerPP(FFmpegPostProcessor):
filename = info['filepath'] filename = info['filepath']
args = ['-c', 'copy', '-map', '0:v:0', '-map', '1:a:0', '-shortest'] args = ['-c', 'copy', '-map', '0:v:0', '-map', '1:a:0', '-shortest']
self._downloader.to_screen('[ffmpeg] Merging formats into "%s"' % filename) self._downloader.to_screen('[ffmpeg] Merging formats into "%s"' % filename)
#first attempt to merge them as normal but if a merge error happens attempt to eat it and try again with mkv output
#attempt to merge the files into the filename that the upstream methods have determined #attempt to merge the files into the filename that the upstream methods have determined
#there's little point to try to guess from the start which video format will be compatible with which audio #there's little point to try to guess from the start which video format will be compatible with which audio
#if the standard merge fails, fallback to mkv instead #so instead just try merging with what we have and see what happens
try: try:
self.run_ffmpeg_multiple_files(info['__files_to_merge'], filename, args) self.run_ffmpeg_multiple_files(info['__files_to_merge'], filename, args)
except FFmpegPostProcessorError as fpe: except FFmpegPostProcessorError as fpe: