- Added support for multiple streaming_consumers on the same channel

[casparcg] / modules / ffmpeg / ffmpeg.cpp

diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp
index 28cff6f12f759dffdc73a08f21d45551674a1f30..287288775b4cab5d240937177464dafc7c633db8 100644 (file)
--- a/modules/ffmpeg/ffmpeg.cpp
+++ b/modules/ffmpeg/ffmpeg.cpp
@@ -22,6 +22,7 @@
 #include "StdAfx.h"\r
 \r
 #include "consumer/ffmpeg_consumer.h"\r
+#include "consumer/streaming_consumer.h"\r
 #include "producer/ffmpeg_producer.h"\r
 #include "producer/util/util.h"\r
 \r
@@ -199,7 +200,7 @@ std::shared_ptr<void> temporary_disable_logging_for_thread(bool disable)
 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
+       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
 \r
@@ -254,6 +255,7 @@ void init(const safe_ptr<core::media_info_repository>& media_info_repo)
     avformat_network_init();\r
        \r
        core::register_consumer_factory([](const core::parameters& params){return ffmpeg::create_consumer(params);});\r
+       core::register_consumer_factory([](const core::parameters& params){return ffmpeg::create_streaming_consumer(params);});\r
        core::register_producer_factory(create_producer);\r
        core::register_thumbnail_producer_factory(create_thumbnail_producer);\r
 \r