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