]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorRonag <Ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sat, 6 Aug 2011 09:47:40 +0000 (09:47 +0000)
committerRonag <Ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sat, 6 Aug 2011 09:47:40 +0000 (09:47 +0000)
core/mixer/image/image_mixer.cpp

index 751cf8ea15aeca243ad739884d0b138fb58d2eb9..32eab2a28fd16a857fef94dfdcb3ff7ea075480e 100644 (file)
@@ -68,10 +68,10 @@ struct image_mixer::implementation : boost::noncopyable
 public:\r
        implementation(video_channel_context& video_channel) \r
                : channel_(video_channel)\r
+               , transform_stack_(1)\r
+               , mode_stack_(1, video_mode::progressive)\r
        {\r
                initialize_buffers();\r
-               transform_stack_.push_back(image_transform());\r
-               mode_stack_.push_back(video_mode::progressive);\r
 \r
                channel_.ogl().invoke([=]\r
                {\r
@@ -103,7 +103,9 @@ public:
        }\r
                \r
        void visit(core::write_frame& frame)\r
-       {               \r
+       {       \r
+               CASPAR_ASSERT(!layers_.empty());\r
+\r
                // Check if frame has been discarded by interlacing\r
                if(boost::range::find(mode_stack_, video_mode::upper) != mode_stack_.end() && boost::range::find(mode_stack_, video_mode::lower) != mode_stack_.end())\r
                        return;\r