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

Update join video postprocessor due to API change

Browse Source
This commit is contained in:
Mark Lee 2015-08-10 21:15:51 -07:00
parent 3bbd930bcb
commit f18e093d94
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/postprocessor/ffmpeg.py
View File

@ -403,7 +403,7 @@ class FFmpegJoinVideosPP(FFmpegPostProcessor):
filename = information['filepath'] filename = information['filepath']
parts = information.get('parts') parts = information.get('parts')
if parts is None or len(parts) == 1: if parts is None or len(parts) == 1:
return (True, information) return [], information
parts_files = [build_part_filename(filename, i) for (i, _) in enumerate(parts)] parts_files = [build_part_filename(filename, i) for (i, _) in enumerate(parts)]
files_file = u'%s.videos' % filename files_file = u'%s.videos' % filename
with io.open(encodeFilename(files_file), 'w', encoding='utf-8') as f: with io.open(encodeFilename(files_file), 'w', encoding='utf-8') as f:
@ -413,13 +413,11 @@ class FFmpegJoinVideosPP(FFmpegPostProcessor):
try: try:
self.run_ffmpeg(files_file, filename, ['-c', 'copy'], ['-f', 'concat']) self.run_ffmpeg(files_file, filename, ['-c', 'copy'], ['-f', 'concat'])
except FFmpegPostProcessorError: except FFmpegPostProcessorError:
return False, information return [filename], information
os.remove(encodeFilename(files_file)) os.remove(encodeFilename(files_file))
# We have to manually remove the parts if requested
if not self._downloader.params.get('keepvideo', False): if not self._downloader.params.get('keepvideo', False):
for part_file in parts_files: return parts_files, information
os.remove(encodeFilename(part_file)) return [], information
return (True, information)
class FFmpegMergerPP(FFmpegPostProcessor): class FFmpegMergerPP(FFmpegPostProcessor):