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

diff --git a/core/producer/frame/basic_frame.cpp b/core/producer/frame/basic_frame.cpp
index e0880530ff8c3ae358229eed7ae82c496c92b5b4..1f3cd0e7a8a85875763e6414bac7178fd1e80069 100644 (file)
--- a/core/producer/frame/basic_frame.cpp
+++ b/core/producer/frame/basic_frame.cpp
@@ -152,15 +152,12 @@ safe_ptr<basic_frame> basic_frame::combine(const safe_ptr<basic_frame>& frame1,
 \r
 safe_ptr<basic_frame> basic_frame::fill_and_key(const safe_ptr<basic_frame>& fill, const safe_ptr<basic_frame>& key)\r
 {\r
-       if(fill == basic_frame::empty() && key == basic_frame::empty())\r
+       if(fill == basic_frame::empty() || key == basic_frame::empty())\r
                return basic_frame::empty();\r
        \r
-       if(fill == basic_frame::eof() && key == basic_frame::eof())\r
+       if(fill == basic_frame::eof() || key == basic_frame::eof())\r
                return basic_frame::eof();\r
 \r
-       if(key == basic_frame::empty() || key == basic_frame::eof())\r
-               return fill;\r
-\r
        std::vector<safe_ptr<basic_frame>> frames;\r
        key->get_image_transform().set_is_key(true);\r
        frames.push_back(key);\r

diff --git a/core/producer/separated/separated_producer.cpp b/core/producer/separated/separated_producer.cpp
index 1dd86e00e2a25f2d7dda65c22855ed073d6b460e..adf10e660134c18b3e10a3aaef5e997e275688e4 100644 (file)
--- a/core/producer/separated/separated_producer.cpp
+++ b/core/producer/separated/separated_producer.cpp
@@ -60,7 +60,7 @@ struct separated_producer : public frame_producer
                auto frame = basic_frame::fill_and_key(fill_, key_);\r
 \r
                fill_ = basic_frame::late();\r
-               key_ = basic_frame::late();\r
+               key_  = basic_frame::late();\r
 \r
                return last_frame_ = frame;\r
        }\r