allow all video formats, and merge into mp4
This commit is contained in:
parent
2b3cd13bfd
commit
058e03876f
|
|
@ -36,10 +36,10 @@ class Download:
|
||||||
self.download_dir = download_dir
|
self.download_dir = download_dir
|
||||||
self.output_template = output_template
|
self.output_template = output_template
|
||||||
if quality == 'best':
|
if quality == 'best':
|
||||||
self.format = 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best'
|
self.format = 'bestvideo+bestaudio/best[ext=mp4]/best'
|
||||||
elif quality in ('1440p', '1080p', '720p', '480p'):
|
elif quality in ('1440p', '1080p', '720p', '480p'):
|
||||||
res = quality[:-1]
|
res = quality[:-1]
|
||||||
self.format = f'bestvideo[height<={res}][ext=mp4]+bestaudio[ext=m4a]/best[height<={res}][ext=mp4]/best[height<={res}]'
|
self.format = f'bestvideo[height<={res}]+bestaudio/best[height<={res}][ext=mp4]/best[height<={res}]'
|
||||||
elif quality == 'audio':
|
elif quality == 'audio':
|
||||||
self.format = 'bestaudio'
|
self.format = 'bestaudio'
|
||||||
elif quality.startswith('custom:'):
|
elif quality.startswith('custom:'):
|
||||||
|
|
@ -73,6 +73,7 @@ class Download:
|
||||||
#'skip_download': True,
|
#'skip_download': True,
|
||||||
'outtmpl': os.path.join(self.download_dir, self.output_template),
|
'outtmpl': os.path.join(self.download_dir, self.output_template),
|
||||||
'format': self.format,
|
'format': self.format,
|
||||||
|
'merge_output_format': 'mp4',
|
||||||
'cachedir': False,
|
'cachedir': False,
|
||||||
'socket_timeout': 30,
|
'socket_timeout': 30,
|
||||||
'progress_hooks': [put_status],
|
'progress_hooks': [put_status],
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue