X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fffmpeg%2FStdAfx.h;h=f7fb536ae90c8c5d638caed16f56e390d6410b20;hb=ce7d4df26ca9ee3bda33969597dee934867f1c74;hp=f7e56ad990a43d50d21b4d23b502bd363f4eafc6;hpb=5bee5deb850c0744be543105f04e880012b6012a;p=casparcg

diff --git a/modules/ffmpeg/StdAfx.h b/modules/ffmpeg/StdAfx.h
index f7e56ad99..f7fb536ae 100644
--- a/modules/ffmpeg/StdAfx.h
+++ b/modules/ffmpeg/StdAfx.h
@@ -1,73 +1,100 @@
-/*
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
-*
-* 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 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
-*/
-
-#pragma once
-
-#ifdef _DEBUG
-#include <crtdbg.h>
-#endif
-
-#define NOMINMAX
-
-#include <memory>
-#include <array>
-#include <functional>
-#include <algorithm>
-#include <vector>
-#include <deque>
-#include <queue>
-#include <string>
-#include <math.h>
-
-#include <tbb/atomic.h>
-#include <tbb/concurrent_queue.h>
-#include <tbb/parallel_for.h>
-
-#include <boost/assign.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
-#include <boost/range/algorithm.hpp>
-#include <boost/property_tree/ptree.hpp>
-#include <boost/assign.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>
-
-#pragma warning(push, 1)
-
-extern "C" 
-{
-	#define __STDC_CONSTANT_MACROS
-	#define __STDC_LIMIT_MACROS
-	#include <libavformat/avformat.h>
-	#include <libavcodec/avcodec.h>
-	#include <libavfilter/avfilter.h>
-	#include <libswscale/swscale.h>
-}
-
-#pragma warning(pop)
+/*
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+*
+* 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 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
+*/
+
+#pragma once
+
+#if defined _DEBUG && defined _MSC_VER
+#include <crtdbg.h>
+#endif
+
+#define NOMINMAX
+#define WIN32_LEAN_AND_MEAN
+
+#include <algorithm>
+#include <array>
+#include <assert.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/filesystem.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 <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 <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>
+#include <common/timer.h>
+
+#pragma warning(push, 1)
+
+extern "C" 
+{
+	#define __STDC_CONSTANT_MACROS
+	#define __STDC_LIMIT_MACROS
+	#include <libavcodec/avcodec.h>
+	#include <libavfilter/avcodec.h>
+	#include <libavfilter/avfilter.h>
+	#include <libavfilter/avfiltergraph.h>
+	#include <libavfilter/buffersink.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>
+}
+
+#pragma warning(pop)