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

diff --git a/core/consumer/frame_consumer_device.cpp b/core/consumer/frame_consumer_device.cpp
index cef5c198bb3fec8c800a105885daaa4f8fb55148..6f810331c1f93abbb3a3fa64179a09cf96882a9b 100644 (file)
--- a/core/consumer/frame_consumer_device.cpp
+++ b/core/consumer/frame_consumer_device.cpp
@@ -47,7 +47,7 @@ public:
        {               \r
                executor_.begin_invoke([=]\r
                {\r
-                       buffer_.push_back(frame);\r
+                       buffer_.push_back(std::move(frame));\r
 \r
                        if(!buffer_.full())\r
                                return;\r

diff --git a/core/processor/fwd.h b/core/processor/fwd.h
index 3b482352ae0869c43e81dd6cedc6ace17b29ade8..1bb643633ca41e1df170004a8a0ba5b5c4d9b2de 100644 (file)
--- a/core/processor/fwd.h
+++ b/core/processor/fwd.h
@@ -7,8 +7,6 @@ namespace caspar { namespace core {
 class read_frame;\r
 class write_frame;\r
 class draw_frame;\r
-class draw_frame;\r
-class draw_frame;\r
 \r
 class image_processor;\r
 class frame_processor;\r

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index 7b9c0ae2fb4cea6d82ea541a5a73866ca624676e..530ef1ce7c82123ddcba71e753ce175e13d06249 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -86,6 +86,7 @@ struct transition_producer::implementation : boost::noncopyable
                catch(...)\r
                {\r
                        CASPAR_LOG_CURRENT_EXCEPTION();\r
+                       producer = frame_producer::empty();\r
                        CASPAR_LOG(warning) << "Failed to receive frame. Removed producer from transition.";\r
                }\r
 \r
@@ -101,6 +102,7 @@ struct transition_producer::implementation : boost::noncopyable
                        catch(...)\r
                        {\r
                                CASPAR_LOG_CURRENT_EXCEPTION();\r
+                               producer = frame_producer::empty();\r
                                CASPAR_LOG(warning) << "Failed to initialize following producer.";\r
                        }\r
 \r