git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/accelerator/image/image_mixer.cpp b/accelerator/image/image_mixer.cpp
index 61ffd37a8781ba8cc88bcb7cb273f39719587b99..86be2bf9c35dc634d16c5b7bab2f3d751173ed60 100644 (file)
--- a/accelerator/image/image_mixer.cpp
+++ b/accelerator/image/image_mixer.cpp
@@ -98,13 +98,13 @@ public:
                                return boost::iterator_range<const uint8_t*>(ptr, ptr + buffer->size());\r
                        });\r
                }\r
-               else if(support_uswc_memcpy() &&\r
-                               layers.size() == 1 &&\r
+               else if(layers.size()                           == 1 &&\r
+                           layers.at(0).second.size()  == 1 &&\r
+                               support_uswc_memcpy() &&                                \r
                           (kernel_.has_blend_modes() && layers.at(0).first != core::blend_mode::normal) == false &&\r
-                           layers.at(0).second.size() == 1 &&\r
-                           layers.at(0).second.at(0).pix_desc.format == core::pixel_format::bgra &&\r
+                           layers.at(0).second.at(0).pix_desc.format           == core::pixel_format::bgra &&\r
                            layers.at(0).second.at(0).buffers.at(0)->size() == format_desc.size &&\r
-                           layers.at(0).second.at(0).transform == core::frame_transform())\r
+                           layers.at(0).second.at(0).transform                         == core::frame_transform())\r
                {\r
                        auto source_buffer = layers.at(0).second.at(0).buffers.at(0);\r
                        auto buffer = std::make_shared<std::vector<uint8_t, tbb::cache_aligned_allocator<uint8_t>>>(source_buffer->size());\r