From 4d971a16b831a45147b6ae7ce53b3e105d204da7 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Fri, 19 Mar 2021 16:31:22 +0530 Subject: [PATCH] Merge webm formats into mkv if thumbnails are to be embedded (#173) Co-authored by: Damiano Amatruda --- yt_dlp/YoutubeDL.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py index 8681a18e9..1e46b76b5 100644 --- a/yt_dlp/YoutubeDL.py +++ b/yt_dlp/YoutubeDL.py @@ -2343,10 +2343,17 @@ class YoutubeDL(object): requested_formats = info_dict['requested_formats'] old_ext = info_dict['ext'] - 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.') + 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.') def correct_ext(filename): filename_real_ext = os.path.splitext(filename)[1][1:]