X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fffmpeg%2FStdAfx.h;h=5ecbe80f1cf1f7a2ec4767b4d456317995abacf5;hb=7930b37f8ea94a9c8f0877744baac7cc34458ff8;hp=958e3ccdaf73493c633dc69403ed40c51e0dbf48;hpb=c5f0ad65444bd8f55d9cb5f04f726d9e6f36c964;p=casparcg

diff --git a/modules/ffmpeg/StdAfx.h b/modules/ffmpeg/StdAfx.h
index 958e3ccda..5ecbe80f1 100644
--- a/modules/ffmpeg/StdAfx.h
+++ b/modules/ffmpeg/StdAfx.h
@@ -1,27 +1,23 @@
 /*
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
 *
-*  This file is part of CasparCG.
+* This file is part of CasparCG (www.casparcg.com).
 *
-*    CasparCG is free software: you can redistribute it and/or modify
-*    it under the terms of the GNU General Public License as published by
-*    the Free Software Foundation, either version 3 of the License, or
-*    (at your option) any later version.
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
 *
-*    CasparCG is distributed in the hope that it will be useful,
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*    GNU General Public License for more details.
-
-*    You should have received a copy of the GNU General Public License
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
 *
+* Author: Robert Nagy, ronag89@gmail.com
 */
- 
-// stdafx.h : include file for standard system include files,
-//  or project specific include files that are used frequently, but
-//      are changed infrequently
-//
 
 #pragma once
 
@@ -31,35 +27,55 @@
 
 #define NOMINMAX
 
-#include <memory>
-#include <array>
-#include <functional>
 #include <algorithm>
-#include <vector>
-#include <deque>
-#include <queue>
-#include <string>
-#include <math.h>
-
-#include <agents.h>
-#include <agents_extras.h>
-#include <concrt.h>
-#include <concrt_extras.h>
-#include <ppl.h>
-
+#include <array>
+#include <asmlib.h>
+#include <assert.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string/predicate.hpp>
 #include <boost/assign.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/noncopyable.hpp>
+#include <boost/property_tree/ptree.hpp>
+#include <boost/range/adaptors.hpp>
 #include <boost/range/algorithm.hpp>
-
-#include <common/utility/string.h>
-#include <common/utility/assert.h>
-#include <common/memory/safe_ptr.h>
-//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug
-
-#include <common/log/log.h>
-#include <common/exception/exceptions.h>
-#include <common/exception/win32_exception.h>
+#include <boost/range/algorithm.hpp>
+#include <boost/range/algorithm/find.hpp>
+#include <boost/range/algorithm/find_if.hpp>
+#include <boost/range/algorithm_ext/push_back.hpp>
+#include <boost/range/iterator_range.hpp>
+#include <boost/regex.hpp>
+#include <boost/thread/condition_variable.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/once.hpp>
+#include <boost/thread/thread.hpp>
+#include <boost/timer.hpp>
+#include <crtdbg.h>
+#include <cstdint>
+#include <cstdio>
+#include <deque>
+#include <deque>
+#include <functional>
+#include <iostream>
+#include <limits>
+#include <math.h>
+#include <memory>
+#include <queue>
+#include <sstream>
+#include <string>
+#include <tbb/atomic.h>
+#include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_queue.h>
+#include <tbb/concurrent_unordered_map.h>
+#include <tbb/parallel_for.h>
+#include <tbb/parallel_invoke.h>
+#include <tbb/recursive_mutex.h>
+#include <tbb/tbb_thread.h>
+#include <unordered_map>
+#include <vector>
 
 #pragma warning(push, 1)
 
@@ -67,9 +83,21 @@ extern "C"
 {
 	#define __STDC_CONSTANT_MACROS
 	#define __STDC_LIMIT_MACROS
-	#include <libavformat/avformat.h>
 	#include <libavcodec/avcodec.h>
+	#include <libavfilter/avcodec.h>
 	#include <libavfilter/avfilter.h>
+	#include <libavfilter/avfiltergraph.h>
+	#include <libavfilter/buffersink.h>
+	#include <libavfilter/vsrc_buffer.h>
+	#include <libavformat/avformat.h>
+	#include <libavutil/avutil.h>
+	#include <libavutil/common.h>
+	#include <libavutil/cpu.h>
+	#include <libavutil/error.h>
+	#include <libavutil/imgutils.h>
+	#include <libavutil/opt.h>
+	#include <libavutil/pixdesc.h>
+	#include <libavutil/samplefmt.h>
 	#include <libswscale/swscale.h>
 }