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 77c0fd7b841907aed20725e1e75c4dd3d18af0ba..1eed000ac3b5eb87e21fd685f06ec0eaae70a4e7 100644 (file)
--- a/core/producer/frame/basic_frame.cpp
+++ b/core/producer/frame/basic_frame.cpp
@@ -107,12 +107,12 @@ std::wstring basic_frame::print() const{return impl_->print();}
 void basic_frame::accept(frame_visitor& visitor){impl_->accept(*this, visitor);}\r
 \r
 safe_ptr<basic_frame> basic_frame::interlace(const safe_ptr<basic_frame>& frame1, const safe_ptr<basic_frame>& frame2, video_mode::type mode)\r
-{                      \r
-       if(frame1 == basic_frame::empty() && frame2 == basic_frame::empty())\r
-               return basic_frame::empty();\r
-       \r
+{                              \r
        if(frame1 == basic_frame::eof() || frame2 == basic_frame::eof())\r
                return basic_frame::eof();\r
+\r
+       if(frame1 == basic_frame::empty() && frame2 == basic_frame::empty())\r
+               return basic_frame::empty();\r
        \r
        if(frame1 == frame2 || mode == video_mode::progressive)\r
                return frame2;\r
@@ -137,13 +137,13 @@ safe_ptr<basic_frame> basic_frame::interlace(const safe_ptr<basic_frame>& frame1
 }\r
 \r
 safe_ptr<basic_frame> basic_frame::combine(const safe_ptr<basic_frame>& frame1, const safe_ptr<basic_frame>& frame2)\r
-{\r
-       if(frame1 == basic_frame::empty() && frame2 == basic_frame::empty())\r
-               return basic_frame::empty();\r
-       \r
-       if(frame1 == basic_frame::eof() && frame2 == basic_frame::eof())\r
+{      \r
+       if(frame1 == basic_frame::eof() || frame2 == basic_frame::eof())\r
                return basic_frame::eof();\r
        \r
+       if(frame1 == basic_frame::empty() && frame2 == basic_frame::empty())\r
+               return basic_frame::empty();\r
+\r
        std::vector<safe_ptr<basic_frame>> frames;\r
        frames.push_back(frame1);\r
        frames.push_back(frame2);\r