[ffmpeg] Remove usage of deprecated API usage to easier support a newer version of...

[casparcg] / modules / ffmpeg / StdAfx.h

diff --git a/modules/ffmpeg/StdAfx.h b/modules/ffmpeg/StdAfx.h
index abf2ae996affb61003474be2bcf87210e6a9f31a..96b404275a4b41ffe5d4ae2e5a9c8ffe93983109 100644 (file)
--- a/modules/ffmpeg/StdAfx.h
+++ b/modules/ffmpeg/StdAfx.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#ifdef _DEBUG
+#if defined _DEBUG && defined _MSC_VER
 #include <crtdbg.h>
 #endif
 
@@ -50,8 +50,6 @@
 #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>
@@ -74,15 +72,15 @@
 #include <tbb/tbb_thread.h>
 #include <unordered_map>
 #include <vector>
+#include <common/timer.h>
 
 #pragma warning(push, 1)
 
-extern "C" 
+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>