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 1f3cd0e7a8a85875763e6414bac7178fd1e80069..77c0fd7b841907aed20725e1e75c4dd3d18af0ba 100644 (file)
--- a/core/producer/frame/basic_frame.cpp
+++ b/core/producer/frame/basic_frame.cpp
@@ -151,13 +151,13 @@ safe_ptr<basic_frame> basic_frame::combine(const safe_ptr<basic_frame>& frame1,
 }\r
 \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
-               return basic_frame::empty();\r
-       \r
+{      \r
        if(fill == basic_frame::eof() || key == basic_frame::eof())\r
                return basic_frame::eof();\r
 \r
+       if(fill == basic_frame::empty() || key == basic_frame::empty())\r
+               return basic_frame::empty();\r
+\r
        std::vector<safe_ptr<basic_frame>> frames;\r
        key->get_image_transform().set_is_key(true);\r
        frames.push_back(key);\r