From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Wed, 15 Feb 2012 20:28:12 +0000 (+0000)
Subject: 2.1.0: image_mixer: "empty" output no longer static.
X-Git-Tag: 2.1.0_Beta1~804
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;ds=sidebyside;h=1ddb57fb0d6ba4ab6a087f7143051da760d984bf;p=casparcg

2.1.0: image_mixer: "empty" output no longer static.


git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2421 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
---

diff --git a/accelerator/ogl/image/image_mixer.cpp b/accelerator/ogl/image/image_mixer.cpp
index 5ec0abb4c..433592a69 100644
--- a/accelerator/ogl/image/image_mixer.cpp
+++ b/accelerator/ogl/image/image_mixer.cpp
@@ -132,15 +132,13 @@ public:
 
 private:	
 	boost::shared_future<boost::iterator_range<const uint8_t*>> render(std::vector<layer> layers, const core::video_format_desc& format_desc)
-	{	
-		static const auto empty = spl::make_shared<const std::vector<uint8_t, tbb::cache_aligned_allocator<uint8_t>>>(2048*2048*4, 0);
-		CASPAR_VERIFY(empty->size() >= format_desc.size);
-		
+	{			
 		if(layers.empty())
 		{ // Bypass GPU with empty frame.
+			auto buffer = spl::make_shared<const std::vector<uint8_t, tbb::cache_aligned_allocator<uint8_t>>>(format_desc.size, 0);
 			return async(launch_policy::deferred, [=]
 			{
-				return boost::iterator_range<const uint8_t*>(empty->data(), empty->data() + format_desc.size);
+				return boost::iterator_range<const uint8_t*>(buffer->data(), buffer->data() + format_desc.size);
 			});
 		}
 		else if(has_uswc_memcpy() &&