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

diff --git a/core/consumer/output.h b/core/consumer/output.h
index cc5ecfc300b4db95be83e741f0b0baad830db744..e5d14bf0f628ab38856a10551a90efb34a2bd806 100644 (file)
--- a/core/consumer/output.h
+++ b/core/consumer/output.h
@@ -30,8 +30,6 @@
 \r
 namespace caspar { namespace core {\r
        \r
-class video_channel_context;\r
-\r
 class output : public target<std::pair<safe_ptr<read_frame>, ticket>>, boost::noncopyable\r
 {\r
 public:\r

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index 3b4effcaf2e30f4d80f8f62137ea22b3689cf548..f4e3e2463d671ccae97889eeb5fa848d1575553e 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -25,10 +25,9 @@
 #include <core/producer/frame/frame_transform.h>\r
 \r
 #include <stack>\r
+#include <map>\r
 #include <vector>\r
 \r
-#include <tbb/parallel_for.h>\r
-\r
 namespace caspar { namespace core {\r
 \r
 struct audio_item\r

diff --git a/core/video_channel.h b/core/video_channel.h
index e371e59ee95bc26526fc59c2a86dbc6bfc180fd9..45035486195b759ec8cc3cfdf6ee38fb91cd0acc 100644 (file)
--- a/core/video_channel.h
+++ b/core/video_channel.h
@@ -31,7 +31,6 @@ class mixer;
 class output;\r
 class ogl_device;\r
 struct video_format_desc;\r
-class video_channel_context;\r
 \r
 class video_channel : boost::noncopyable\r
 {\r