2.0. Updated namespaces.

[casparcg] / modules / ffmpeg / producer / filter / filter.h

diff --git a/modules/ffmpeg/producer/filter/filter.h b/modules/ffmpeg/producer/filter/filter.h
index 5e2f94277545b184e1179fbf3b79c6eb4540ccf9..7b3078518aef29cab2a3cd5945bca2442bcd7254 100644 (file)
--- a/modules/ffmpeg/producer/filter/filter.h
+++ b/modules/ffmpeg/producer/filter/filter.h
@@ -2,12 +2,15 @@
 \r
 #include <common/memory/safe_ptr.h>\r
 \r
+#include <boost/noncopyable.hpp>\r
+\r
 #include <string>\r
 #include <vector>\r
 \r
 struct AVFrame;\r
+enum PixelFormat;\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
                \r
 static bool double_rate(const std::wstring& filters)\r
 {\r
@@ -20,10 +23,12 @@ static bool double_rate(const std::wstring& filters)
        return false;\r
 }\r
 \r
-class filter\r
+class filter : boost::noncopyable\r
 {\r
 public:\r
-       filter(const std::wstring& filters = L"");\r
+       filter(const std::wstring& filters = L"", const std::vector<PixelFormat>& pix_fmts = std::vector<PixelFormat>());\r
+       filter(filter&& other);\r
+       filter& operator=(filter&& other);\r
 \r
        std::vector<safe_ptr<AVFrame>> execute(const std::shared_ptr<AVFrame>& frame);\r
 \r
@@ -32,4 +37,4 @@ private:
        safe_ptr<implementation> impl_;\r
 };\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file