2.0:

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

diff --git a/core/mixer/read_frame.cpp b/core/mixer/read_frame.cpp
index 0a6d2a2c3909d78117c7131eef512c1be462d68c..559331be2d7a8733b0a33f5af312be785a8e4cb7 100644 (file)
--- a/core/mixer/read_frame.cpp
+++ b/core/mixer/read_frame.cpp
@@ -40,10 +40,11 @@ public:
 \r
        ~implementation()\r
        {\r
-               ogl_.invoke([this]\r
+               auto image_data = image_data_;\r
+               ogl_.begin_invoke([=]() mutable\r
                {\r
-                       image_data_.reset();\r
-               });\r
+                       image_data.reset();\r
+               }, high_priority);\r
        }\r
 \r
        const boost::iterator_range<const uint8_t*> image_data()\r

diff --git a/core/mixer/write_frame.cpp b/core/mixer/write_frame.cpp
index 2d704141d11dc07e36f9dfad4b988a939ddec277..ec401bd72f5786124be743cdec2b4f270cadbbce 100644 (file)
--- a/core/mixer/write_frame.cpp
+++ b/core/mixer/write_frame.cpp
@@ -60,10 +60,12 @@ public:
 \r
        ~implementation()\r
        {\r
-               ogl_.invoke([=]\r
+               auto buffers = buffers_;\r
+               auto textures = textures_;\r
+               ogl_.begin_invoke([=]() mutable\r
                {\r
-                       buffers_.clear();\r
-                       textures_.clear();\r
+                       buffers.clear();\r
+                       textures.clear();\r
                }, high_priority);\r
        }\r
        \r

diff --git a/modules/decklink/interop/DeckLinkAPI_h.h b/modules/decklink/interop/DeckLinkAPI_h.h
index d7d38dd6254d1a8458fbae0df77f84785a379742..0bed19cc67a4d934a9d0c5a797da064e17262d4a 100644 (file)
--- a/modules/decklink/interop/DeckLinkAPI_h.h
+++ b/modules/decklink/interop/DeckLinkAPI_h.h
@@ -4,7 +4,7 @@
 \r
 \r
  /* File created by MIDL compiler version 7.00.0555 */\r
-/* at Fri Jun 10 12:06:51 2011\r
+/* at Mon Jun 13 12:50:08 2011\r
  */\r
 /* Compiler settings for interop\DeckLinkAPI.idl:\r
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 \r

diff --git a/modules/decklink/interop/DeckLinkAPI_i.c b/modules/decklink/interop/DeckLinkAPI_i.c
index fdf071d4147d5b980d3739ca48069134a10ff0c9..2248538d3df2e4da2bb506a0e9e635a7e1abe904 100644 (file)
--- a/modules/decklink/interop/DeckLinkAPI_i.c
+++ b/modules/decklink/interop/DeckLinkAPI_i.c
@@ -6,7 +6,7 @@
 \r
 \r
  /* File created by MIDL compiler version 7.00.0555 */\r
-/* at Fri Jun 10 12:06:51 2011\r
+/* at Mon Jun 13 12:50:08 2011\r
  */\r
 /* Compiler settings for interop\DeckLinkAPI.idl:\r
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 \r