From b190075f29b603b870b9543fc2d63b0242a1e201 Mon Sep 17 00:00:00 2001 From: Ronag Date: Tue, 9 Aug 2011 19:23:24 +0000 Subject: [PATCH] git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1116 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- core/producer/frame/basic_frame.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/producer/frame/basic_frame.cpp b/core/producer/frame/basic_frame.cpp index 1f3cd0e7a..77c0fd7b8 100644 --- a/core/producer/frame/basic_frame.cpp +++ b/core/producer/frame/basic_frame.cpp @@ -151,13 +151,13 @@ safe_ptr basic_frame::combine(const safe_ptr& frame1, } safe_ptr basic_frame::fill_and_key(const safe_ptr& fill, const safe_ptr& key) -{ - if(fill == basic_frame::empty() || key == basic_frame::empty()) - return basic_frame::empty(); - +{ if(fill == basic_frame::eof() || key == basic_frame::eof()) return basic_frame::eof(); + if(fill == basic_frame::empty() || key == basic_frame::empty()) + return basic_frame::empty(); + std::vector> frames; key->get_image_transform().set_is_key(true); frames.push_back(key); -- 2.39.5