github/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-30 11:21:29 -05:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Merge webm formats into mkv if thumbnails are to be embedded (#173)"

Browse source 
This reverts commit 4d971a16b8 by @damianoamatruda
Closes #500

This was wrongly checking for `write_thumbnail`
This commit is contained in:
pukkandan 2021-07-15 23:30:49 +05:30
parent 47193e0298
commit 3b297919e0
No known key found for this signature in database
GPG key ID: 0F00D95A001F4698
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
yt_dlp/YoutubeDL.py
View file

@ -2590,17 +2590,10 @@ def compatible_formats(formats):
requested_formats = info_dict['requested_formats'] requested_formats = info_dict['requested_formats']
old_ext = info_dict['ext'] old_ext = info_dict['ext']
if self.params.get('merge_output_format') is None: if self.params.get('merge_output_format') is None and not compatible_formats(requested_formats):
if not compatible_formats(requested_formats): info_dict['ext'] = 'mkv'
info_dict['ext'] = 'mkv' self.report_warning(
self.report_warning( 'Requested formats are incompatible for merge and will be merged into mkv.')
'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): def correct_ext(filename):
filename_real_ext = os.path.splitext(filename)[1][1:] filename_real_ext = os.path.splitext(filename)[1][1:]