2.1.0: Merged in trunk.Merged revision(s) 1895-1896 from server/trunk:

[casparcg] / modules / ffmpeg / StdAfx.h

diff --git a/modules/ffmpeg/StdAfx.h b/modules/ffmpeg/StdAfx.h
index 958e3ccdaf73493c633dc69403ed40c51e0dbf48..5ecbe80f1cf1f7a2ec4767b4d456317995abacf5 100644 (file)
--- a/modules/ffmpeg/StdAfx.h
+++ b/modules/ffmpeg/StdAfx.h
@@ -1,27 +1,23 @@
 /*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+* Copyright (c) 2011 Sveriges Television AB <info@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
-// stdafx.h : include file for standard system include files,\r
-//  or project specific include files that are used frequently, but\r
-//      are changed infrequently\r
-//\r
 \r
 #pragma once\r
 \r
@@ -31,35 +27,55 @@
 \r
 #define NOMINMAX\r
 \r
-#include <memory>\r
-#include <array>\r
-#include <functional>\r
 #include <algorithm>\r
-#include <vector>\r
-#include <deque>\r
-#include <queue>\r
-#include <string>\r
-#include <math.h>\r
-\r
-#include <agents.h>\r
-#include <agents_extras.h>\r
-#include <concrt.h>\r
-#include <concrt_extras.h>\r
-#include <ppl.h>\r
-\r
+#include <array>\r
+#include <asmlib.h>\r
+#include <assert.h>\r
+#include <boost/algorithm/string.hpp>\r
+#include <boost/algorithm/string/case_conv.hpp>\r
+#include <boost/algorithm/string/predicate.hpp>\r
 #include <boost/assign.hpp>\r
 #include <boost/filesystem.hpp>\r
 #include <boost/foreach.hpp>\r
+#include <boost/lexical_cast.hpp>\r
+#include <boost/noncopyable.hpp>\r
+#include <boost/property_tree/ptree.hpp>\r
+#include <boost/range/adaptors.hpp>\r
 #include <boost/range/algorithm.hpp>\r
-\r
-#include <common/utility/string.h>\r
-#include <common/utility/assert.h>\r
-#include <common/memory/safe_ptr.h>\r
-//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
-\r
-#include <common/log/log.h>\r
-#include <common/exception/exceptions.h>\r
-#include <common/exception/win32_exception.h>\r
+#include <boost/range/algorithm.hpp>\r
+#include <boost/range/algorithm/find.hpp>\r
+#include <boost/range/algorithm/find_if.hpp>\r
+#include <boost/range/algorithm_ext/push_back.hpp>\r
+#include <boost/range/iterator_range.hpp>\r
+#include <boost/regex.hpp>\r
+#include <boost/thread/condition_variable.hpp>\r
+#include <boost/thread/mutex.hpp>\r
+#include <boost/thread/once.hpp>\r
+#include <boost/thread/thread.hpp>\r
+#include <boost/timer.hpp>\r
+#include <crtdbg.h>\r
+#include <cstdint>\r
+#include <cstdio>\r
+#include <deque>\r
+#include <deque>\r
+#include <functional>\r
+#include <iostream>\r
+#include <limits>\r
+#include <math.h>\r
+#include <memory>\r
+#include <queue>\r
+#include <sstream>\r
+#include <string>\r
+#include <tbb/atomic.h>\r
+#include <tbb/cache_aligned_allocator.h>\r
+#include <tbb/concurrent_queue.h>\r
+#include <tbb/concurrent_unordered_map.h>\r
+#include <tbb/parallel_for.h>\r
+#include <tbb/parallel_invoke.h>\r
+#include <tbb/recursive_mutex.h>\r
+#include <tbb/tbb_thread.h>\r
+#include <unordered_map>\r
+#include <vector>\r
 \r
 #pragma warning(push, 1)\r
 \r
@@ -67,9 +83,21 @@ extern "C"
 {\r
        #define __STDC_CONSTANT_MACROS\r
        #define __STDC_LIMIT_MACROS\r
-       #include <libavformat/avformat.h>\r
        #include <libavcodec/avcodec.h>\r
+       #include <libavfilter/avcodec.h>\r
        #include <libavfilter/avfilter.h>\r
+       #include <libavfilter/avfiltergraph.h>\r
+       #include <libavfilter/buffersink.h>\r
+       #include <libavfilter/vsrc_buffer.h>\r
+       #include <libavformat/avformat.h>\r
+       #include <libavutil/avutil.h>\r
+       #include <libavutil/common.h>\r
+       #include <libavutil/cpu.h>\r
+       #include <libavutil/error.h>\r
+       #include <libavutil/imgutils.h>\r
+       #include <libavutil/opt.h>\r
+       #include <libavutil/pixdesc.h>\r
+       #include <libavutil/samplefmt.h>\r
        #include <libswscale/swscale.h>\r
 }\r
 \r