mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-30 12:01:28 +00:00
fix merge conflict resolution typo
This commit is contained in:
parent
e66fc7ade2
commit
ba45b57c0b
|
@ -847,7 +847,7 @@ def run(self, info):
|
|||
if fmt.get('vcodec') != 'none':
|
||||
args.extend(['-map', f'{i}:v:0'])
|
||||
self.to_screen(f'Merging formats into "{filename}"')
|
||||
self.run_ffmpeg_multiple_files(info['__files_to_merge'], temp_filename, args, info_dict=info)
|
||||
self.run_ffmpeg_multiple_files(info['__files_to_merge'], temp_filename, args, info_dict=info)
|
||||
os.rename(temp_filename, filename)
|
||||
return info['__files_to_merge'], info
|
||||
|
||||
|
|
Loading…
Reference in a new issue