git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp
index d59d2abb291ae686e26518eb619825027c990ed3..b245c0b90822d40ca01a1480df862852f345ca61 100644 (file)
--- a/core/consumer/output.cpp
+++ b/core/consumer/output.cpp
@@ -33,6 +33,7 @@
 #include <common/utility/assert.h>\r
 #include <common/utility/timer.h>\r
 \r
+#include <concurrent_vector.h>\r
 #include <concrt_extras.h>\r
 \r
 using namespace Concurrency;\r
@@ -110,7 +111,10 @@ public:
                                                \r
        void execute(const output::source_element_t& element)\r
        {       \r
-               auto frame = element.first;\r
+               const auto frame = element.first;\r
+\r
+               if(frame->image_data().size() != format_desc_.size)\r
+                       return;\r
 \r
                {\r
                        critical_section::scoped_lock lock(mutex_);             \r
@@ -121,7 +125,7 @@ public:
                                timer_.tick(1.0/format_desc_.fps);\r
                        }\r
                                \r
-                       auto minmax = minmax_buffer_depth();\r
+                       const auto minmax = minmax_buffer_depth();\r
 \r
                        frames_.set_capacity(minmax.second - minmax.first + 1);\r
                        frames_.push_back(frame);\r
@@ -129,7 +133,7 @@ public:
                        if(!frames_.full())\r
                                return;\r
 \r
-                       std::vector<int> removables;            \r
+                       Concurrency::concurrent_vector<int> removables;         \r
                        Concurrency::parallel_for_each(consumers_.begin(), consumers_.end(), [&](const decltype(*consumers_.begin())& pair)\r
                        {               \r
                                try\r