diff options
author | Jesús <heckyel@hyperbola.info> | 2022-02-14 21:36:03 -0500 |
---|---|---|
committer | Jesús <heckyel@hyperbola.info> | 2022-02-14 21:36:03 -0500 |
commit | 4f624b4480a00019ff589b4b6b6060d59e241cef (patch) | |
tree | 51f399e65ea50d7afb6e665c6b764b9a17ee26d6 /yt_dlp/YoutubeDL.py | |
parent | efa26c289d48935cbd6410843cbe19c9f9d83bb0 (diff) | |
parent | 2d41e2ecebb62b572d8bb5b2e4e51ba12f3f0510 (diff) | |
download | hypervideo-pre-4f624b4480a00019ff589b4b6b6060d59e241cef.tar.lz hypervideo-pre-4f624b4480a00019ff589b4b6b6060d59e241cef.tar.xz hypervideo-pre-4f624b4480a00019ff589b4b6b6060d59e241cef.zip |
updated from upstream | 14/02/2022 at 21:36
Diffstat (limited to 'yt_dlp/YoutubeDL.py')
-rw-r--r-- | yt_dlp/YoutubeDL.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py index 1fb551754..2043614ed 100644 --- a/yt_dlp/YoutubeDL.py +++ b/yt_dlp/YoutubeDL.py @@ -3050,9 +3050,11 @@ class YoutubeDL(object): 'while also allowing unplayable formats to be downloaded. ' 'The formats won\'t be merged to prevent data corruption.') elif not merger.available: - self.report_warning( - 'You have requested merging of multiple formats but ffmpeg is not installed. ' - 'The formats won\'t be merged.') + msg = 'You have requested merging of multiple formats but ffmpeg is not installed' + if not self.params.get('ignoreerrors'): + self.report_error(f'{msg}. Aborting due to --abort-on-error') + return + self.report_warning(f'{msg}. The formats won\'t be merged') if temp_filename == '-': reason = ('using a downloader other than ffmpeg' if FFmpegFD.can_merge_formats(info_dict, self.params) |