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

diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp
index 572982740f800a478ed619e8e37d182da6167fe9..76af7fa7f25f1b8dde9475b9a28daa638fb73926 100644 (file)
--- a/modules/ffmpeg/ffmpeg.cpp
+++ b/modules/ffmpeg/ffmpeg.cpp
@@ -28,7 +28,7 @@
 #include <core/consumer/frame_consumer.h>\r
 #include <core/producer/frame_producer.h>\r
 \r
-#include <ppl.h>\r
+#include <boost/thread/recursive_mutex.hpp>\r
 \r
 #if defined(_MSC_VER)\r
 #pragma warning (disable : 4244)\r
@@ -53,13 +53,13 @@ int ffmpeg_lock_callback(void **mutex, enum AVLockOp op)
        if(!mutex)\r
                return 0;\r
 \r
-       auto my_mutex = reinterpret_cast<Concurrency::critical_section*>(*mutex);\r
+       auto my_mutex = reinterpret_cast<boost::recursive_mutex*>(*mutex);\r
        \r
        switch(op) \r
        { \r
                case AV_LOCK_CREATE: \r
                { \r
-                       *mutex = new Concurrency::critical_section(); \r
+                       *mutex = new boost::recursive_mutex(); \r
                        break; \r
                } \r
                case AV_LOCK_OBTAIN: \r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index d6703bf8129dffaa9f6e53de3073ff88eefd458d..0331840b275257df958a3ddb23c9e90d6ea04d0d 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -47,7 +47,6 @@
 \r
 #include <agents.h>\r
 #include <agents_extras.h>\r
-#include <connect.h>\r
 #include <concrt.h>\r
 #include <ppl.h>\r
 \r
@@ -70,10 +69,10 @@ struct ffmpeg_producer : public core::frame_producer
                \r
        const safe_ptr<diagnostics::graph>                              graph_;\r
                                        \r
-       input                                                                                   input_; \r
-       std::shared_ptr<video_decoder>                                  video_decoder_;\r
        std::shared_ptr<audio_decoder>                                  audio_decoder_; \r
+       std::shared_ptr<video_decoder>                                  video_decoder_;\r
        std::unique_ptr<frame_muxer2>                                   muxer_;\r
+       input                                                                                   input_; \r
 \r
        safe_ptr<core::basic_frame>                                             last_frame_;\r
        \r
@@ -122,7 +121,7 @@ public:
                        CASPAR_LOG(warning) << "Failed to open audio-stream. Running without audio.";           \r
                }\r
                \r
-               Concurrency::connect(packets_, throw_away_);\r
+               packets_.link_target(&throw_away_);\r
 \r
                CASPAR_VERIFY(video_decoder_ || audio_decoder_, ffmpeg_error());\r
 \r