2.1.0:

[casparcg] / core / video_channel.cpp

diff --git a/core/video_channel.cpp b/core/video_channel.cpp
index 458a59d141f82e0c7efd85b29cbdaec856af0aa0..e6aac33f01ac8c0219d0d8cbd0d012a39f1b9f2c 100644 (file)
--- a/core/video_channel.cpp
+++ b/core/video_channel.cpp
@@ -56,9 +56,12 @@ public:
                , format_desc_(format_desc)\r
                , ogl_(ogl)\r
                , output_(new caspar::core::output(graph_, format_desc, index))\r
-               , mixer_(new caspar::core::mixer(graph_, output_, format_desc, ogl))\r
-               , stage_(new caspar::core::stage(graph_, mixer_, format_desc))  \r
+               , mixer_(new caspar::core::mixer(graph_, format_desc, ogl))\r
+               , stage_(new caspar::core::stage(graph_, format_desc))  \r
        {\r
+               mixer_->link_target(output_);\r
+               stage_->link_target(mixer_);\r
+\r
                graph_->set_text(print());\r
                diagnostics::register_graph(graph_);\r
 \r
@@ -70,6 +73,9 @@ public:
        \r
        void set_video_format_desc(const video_format_desc& format_desc)\r
        {\r
+               if(format_desc.format == core::video_format::invalid)\r
+                       BOOST_THROW_EXCEPTION(invalid_argument() << msg_info("Invalid video-format"));\r
+\r
                try\r
                {\r
                        output_->set_video_format_desc(format_desc);\r