From 3b297919e046082cc4ab26ecb959d9f4f584102b Mon Sep 17 00:00:00 2001 From: pukkandan Date: Thu, 15 Jul 2021 23:30:49 +0530 Subject: [PATCH] Revert "Merge webm formats into mkv if thumbnails are to be embedded (#173)" This reverts commit 4d971a16b831a45147b6ae7ce53b3e105d204da7 by @damianoamatruda Closes #500 This was wrongly checking for `write_thumbnail` --- yt_dlp/YoutubeDL.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py index 6cfcee455a..5b603690c3 100644 --- a/yt_dlp/YoutubeDL.py +++ b/yt_dlp/YoutubeDL.py @@ -2590,17 +2590,10 @@ def compatible_formats(formats): requested_formats = info_dict['requested_formats'] old_ext = info_dict['ext'] - if self.params.get('merge_output_format') is None: - if not compatible_formats(requested_formats): - info_dict['ext'] = 'mkv' - self.report_warning( - 'Requested formats are incompatible for merge and will be merged into mkv.') - if (info_dict['ext'] == 'webm' - and self.params.get('writethumbnail', False) - and info_dict.get('thumbnails')): - info_dict['ext'] = 'mkv' - self.report_warning( - 'webm doesn\'t support embedding a thumbnail, mkv will be used.') + if self.params.get('merge_output_format') is None and not compatible_formats(requested_formats): + info_dict['ext'] = 'mkv' + self.report_warning( + 'Requested formats are incompatible for merge and will be merged into mkv.') def correct_ext(filename): filename_real_ext = os.path.splitext(filename)[1][1:]