* Created custom decklink allocator for reducing memory footprint.

[casparcg] / modules / ffmpeg / ffmpeg.cpp

diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp
index ad9a1becc134a7f4afc8454a789ade2283021b09..68f51c3c94f202d9a8098341442a843a59f61bd7 100644 (file)
--- a/modules/ffmpeg/ffmpeg.cpp
+++ b/modules/ffmpeg/ffmpeg.cpp
@@ -25,6 +25,7 @@
 #include "producer/ffmpeg_producer.h"\r
 \r
 #include <common/log/log.h>\r
+#include <common/exception/win32_exception.h>\r
 \r
 #include <core/parameters/parameters.h>\r
 #include <core/consumer/frame_consumer.h>\r
@@ -55,6 +56,7 @@ namespace caspar { namespace ffmpeg {
        \r
 int ffmpeg_lock_callback(void **mutex, enum AVLockOp op) \r
 { \r
+       win32_exception::ensure_handler_installed_for_thread("ffmpeg-thread");\r
        if(!mutex)\r
                return 0;\r
 \r
@@ -193,6 +195,7 @@ std::shared_ptr<void> temporary_disable_logging_for_thread(bool disable)
 \r
 void log_for_thread(void* ptr, int level, const char* fmt, va_list vl)\r
 {\r
+       win32_exception::ensure_handler_installed_for_thread("ffmpeg-thread");\r
        //if (get_disable_logging_for_thread().get() == nullptr) // It does not matter what the value of the bool is\r
                log_callback(ptr, level, fmt, vl);\r
 }\r