From 7bf0d6ac19bdc27f8a32a95858e9e45d9720eb8b Mon Sep 17 00:00:00 2001 From: Jean-Pierre Coetzee Date: Mon, 20 Mar 2023 22:54:19 +0200 Subject: [PATCH] Fix for error not being caught when FFMPEG throws --- src/modules/ffmpeg/producer/av_producer.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/modules/ffmpeg/producer/av_producer.cpp b/src/modules/ffmpeg/producer/av_producer.cpp index 0e0f55432d..40115bb716 100644 --- a/src/modules/ffmpeg/producer/av_producer.cpp +++ b/src/modules/ffmpeg/producer/av_producer.cpp @@ -205,17 +205,10 @@ class Decoder } } catch (boost::thread_interrupted&) { // Do nothing... - } catch (ffmpeg::ffmpeg_error_t& ex) { - if (auto errn = boost::get_error_info(ex)) { - if (*errn == AVERROR_EXIT) { - return; - } - } - CASPAR_LOG_CURRENT_EXCEPTION(); } catch (...) { CASPAR_LOG_CURRENT_EXCEPTION(); + eof = true; } - eof = true; }); }