diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-01-24 20:38:22 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-01-24 20:38:22 +0400 |
commit | 75782254417ccb62ba94c58755c6701833ac079d (patch) | |
tree | fd52b96def1a234f116919f8fb6fad88b340d10c /src/filters | |
parent | e0d954769b6b098482bb65b44df353b01d04667c (diff) |
ffmpeg: remove unneeded custom code and update config.h
Diffstat (limited to 'src/filters')
-rw-r--r-- | src/filters/transform/MPCVideoDec/FfmpegContext.cpp | 6 | ||||
-rw-r--r-- | src/filters/transform/MpaDecFilter/MpaDecFilter.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/filters/transform/MPCVideoDec/FfmpegContext.cpp b/src/filters/transform/MPCVideoDec/FfmpegContext.cpp index df8261d03..965e47b81 100644 --- a/src/filters/transform/MPCVideoDec/FfmpegContext.cpp +++ b/src/filters/transform/MPCVideoDec/FfmpegContext.cpp @@ -1,5 +1,5 @@ /*
- * (C) 2007-2012 see Authors.txt
+ * (C) 2007-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -22,7 +22,9 @@ #include <WinNT.h>
#include <vfwmsgs.h>
#include <sys/timeb.h>
+#if defined(STANDALONE_FILTER) && defined(_WIN64)
#include <time.h> // for the _time64 workaround
+#endif
#include "FfmpegContext.h"
#include "../../../DSUtil/SysVersion.h"
@@ -54,8 +56,10 @@ extern "C" { #if defined(STANDALONE_FILTER)
void* __imp_toupper = toupper;
+#if defined(_WIN64)
void* __imp_time64 = _time64;
#endif
+#endif
#define CHECK_AVC_L52_SIZE(w, h) ((w) <= 4096 && (h) <= 4096 && (w) * (h) <= 36864 * 16 * 16)
diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp index 1acbba1dc..583181ffd 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp @@ -1,6 +1,6 @@ /*
* (C) 2003-2006 Gabest
- * (C) 2006-2012 see Authors.txt
+ * (C) 2006-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -33,7 +33,9 @@ #ifdef STANDALONE_FILTER
void* __imp_toupper = toupper;
+#if defined(_WIN64)
void* __imp_time64 = _time64;
+#endif
#include <InitGuid.h>
|