#297 Fixed support for flash templates with spaces in the file name.

[casparcg] / modules / ffmpeg / ffmpeg.h

diff --git a/modules/ffmpeg/ffmpeg.h b/modules/ffmpeg/ffmpeg.h
index d496924b5fd1eb0e652f303d3c91f28af9510963..4162b489e8e814dfacc7f74afed7d556491a7c29 100644 (file)
--- a/modules/ffmpeg/ffmpeg.h
+++ b/modules/ffmpeg/ffmpeg.h
@@ -1,30 +1,42 @@
 /*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
-*  This file is part of CasparCG.\r
+* This file is part of CasparCG (www.casparcg.com).\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
+* 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
-*    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
+* 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
+* 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
+* Author: Robert Nagy, ronag89@gmail.com\r
 */\r
+\r
 #pragma once\r
 \r
 #include <string>\r
+#include <memory>\r
+\r
+namespace caspar { \r
+namespace core {\r
+\r
+struct media_info_repository;\r
+\r
+}\r
 \r
-namespace caspar { namespace ffmpeg {\r
+namespace ffmpeg {\r
 \r
-void init();\r
+void init(const safe_ptr<core::media_info_repository>& media_info_repo);\r
 void uninit();\r
+void disable_logging_for_thread();\r
+std::shared_ptr<void> temporary_disable_logging_for_thread(bool disable);\r
 \r
 std::wstring get_avcodec_version();\r
 std::wstring get_avformat_version();\r