diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-05-21 17:40:14 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-05-21 17:40:14 +0400 |
commit | b485d8d4e256b2b0b9211e0a69c929b5529ddae1 (patch) | |
tree | f1a1f7ded47f0bb917e7556662a12e91a41bd953 /src/filters/transform | |
parent | b19ca940535666e349a63b120116b39feaac371c (diff) |
remove the commented out code in r4819 and add a work around in MpaDecFilter.cpp and FfmpegContext.c for the unresolved externals for Filters x64
partial patch by alexins
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@4825 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform')
-rw-r--r-- | src/filters/transform/MPCVideoDec/FfmpegContext.c | 13 | ||||
-rw-r--r-- | src/filters/transform/MpaDecFilter/MpaDecFilter.cpp | 16 |
2 files changed, 15 insertions, 14 deletions
diff --git a/src/filters/transform/MPCVideoDec/FfmpegContext.c b/src/filters/transform/MPCVideoDec/FfmpegContext.c index edd6891b6..24887fbbf 100644 --- a/src/filters/transform/MPCVideoDec/FfmpegContext.c +++ b/src/filters/transform/MPCVideoDec/FfmpegContext.c @@ -22,12 +22,12 @@ #define HAVE_AV_CONFIG_H
-#define H264_MERGE_TESTING
#include <Windows.h>
#include <WinNT.h>
#include <vfwmsgs.h>
#include <sys/timeb.h>
+#include <time.h> // for the _time64 workaround
#include "FfmpegContext.h"
#include <ffmpeg/libavcodec/dsputil.h>
#include <ffmpeg/libavcodec/avcodec.h>
@@ -41,6 +41,12 @@ #if defined(REGISTER_FILTER) && _WIN64
void *__imp_toupper = toupper;
+void *__imp_time64 = _time64;
+#endif
+
+#ifdef _WIN64
+// Hack to use MinGW64 from 2.x branch
+void __mingw_raise_matherr(int typ, const char *name, double a1, double a2, double rslt) {}
#endif
int av_h264_decode_frame(struct AVCodecContext* avctx, int* nOutPOC, int64_t* rtStartTime, uint8_t *buf, int buf_size);
@@ -817,8 +823,3 @@ BOOL DXVACheckFramesize(int width, int height, DWORD nPCIVendor/*, DWORD nPCIDev return FALSE;
}
-
-#ifdef _WIN64
-// Hack to use MinGW64 from 2.x branch
-void __mingw_raise_matherr(int typ, const char *name, double a1, double a2, double rslt) {}
-#endif
diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp index 5ef9ecae7..ef9485e8b 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp @@ -31,6 +31,14 @@ #include "../../../DSUtil/DSUtil.h"
#ifdef REGISTER_FILTER
+#ifdef _WIN64
+#ifdef _DEBUG
+extern "C" int mingw_app_type = 1; /* 0:console, 1:windows. */
+#endif
+void *__imp_toupper = toupper;
+void *__imp_time64 = _time64;
+#endif
+
#include <InitGuid.h>
#endif
#include <moreuuids.h>
@@ -238,14 +246,6 @@ const AMOVIESETUP_MEDIATYPE sudPinTypesIn[] = { };
#ifdef REGISTER_FILTER
-
-#ifdef _WIN64
-#ifdef _DEBUG
-extern "C" int mingw_app_type = 1; /* 0:console, 1:windows. */
-#endif
-void *__imp_toupper = toupper;
-#endif
-
const AMOVIESETUP_MEDIATYPE sudPinTypesOut[] = {
{&MEDIATYPE_Audio, &MEDIASUBTYPE_PCM},
};
|