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

diff --git a/accelerator/ogl/image/image_mixer.cpp b/accelerator/ogl/image/image_mixer.cpp
index df815f0d3dc98c6ce35b0749da0409d839a0ee3e..e9f5e2ed35a02252e69fe9ea4baa25def29db89a 100644 (file)
--- a/accelerator/ogl/image/image_mixer.cpp
+++ b/accelerator/ogl/image/image_mixer.cpp
@@ -119,7 +119,7 @@ public:
                        else                    \r
                                draw(target_texture, std::move(layers), format_desc, core::field_mode::progressive);\r
                                                                \r
-                       return make_shared(ogl_->copy_async(target_texture));\r
+                       return ogl_->copy_async(target_texture);\r
                }));\r
        }\r
 \r

diff --git a/accelerator/ogl/util/device.cpp b/accelerator/ogl/util/device.cpp
index d01b380c382fc0ca712d368924b97b10c7dde43e..e5bc998a6e786c6ca0bd9e4112ea6b02383f6404 100644 (file)
--- a/accelerator/ogl/util/device.cpp
+++ b/accelerator/ogl/util/device.cpp
@@ -258,14 +258,14 @@ struct device::impl : public std::enable_shared_from_this<impl>
                        source->copy_to(*buffer);       \r
 \r
                        auto self = shared_from_this();\r
-                       return make_shared(async(launch::deferred, [self, buffer]() mutable -> array<const std::uint8_t>\r
+                       return async(launch::deferred, [self, buffer]() mutable -> array<const std::uint8_t>\r
                        {\r
                                const auto& buf = buffer.get();\r
                                if(!buf->data())\r
                                        self->alloc_executor_.invoke(std::bind(&buffer::map, std::ref(buf))); // Defer blocking "map" call until data is needed.\r
 \r
                                return array<const std::uint8_t>(buf->data(), buf->size(), true, buffer);\r
-                       }));\r
+                       });\r
                }, task_priority::high_priority));\r
        }\r
 };\r