2.0. Updated namespaces.

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

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.h b/modules/ffmpeg/producer/ffmpeg_producer.h
index 9ac70f1dbb00125d39c13f78a9e47ed8751fdee4..0158a1092f8edcced4e11397e117a23c94ef835c 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.h
+++ b/modules/ffmpeg/producer/ffmpeg_producer.h
@@ -1,6 +1,23 @@
-#pragma once\r
+/*\r
+* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+*\r
+*  This file is part of CasparCG.\r
+*\r
+*    CasparCG is free software: you can redistribute it and/or modify\r
+*    it under the terms of the GNU General Public License as published by\r
+*    the Free Software Foundation, either version 3 of the License, or\r
+*    (at your option) any later version.\r
+*\r
+*    CasparCG is distributed in the hope that it will be useful,\r
+*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+*    GNU General Public License for more details.\r
 \r
-#include <core/producer/frame_producer.h>\r
+*    You should have received a copy of the GNU General Public License\r
+*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
+*\r
+*/\r
+#pragma once\r
 \r
 #include <common/memory/safe_ptr.h>\r
 \r
@@ -8,7 +25,16 @@
 #include <vector>\r
 \r
 namespace caspar {\r
+\r
+namespace core {\r
+\r
+struct frame_producer;\r
+struct frame_factory;\r
+\r
+}\r
        \r
-safe_ptr<core::frame_producer> create_ffmpeg_producer(const std::vector<std::wstring>& params);\r
+namespace ffmpeg {\r
+\r
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file