diff options
| author | Sven Gothel <[email protected]> | 2013-08-31 02:31:13 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-08-31 02:31:13 +0200 |
| commit | 1693604b4daae4571069b58bdc863516b95999a6 (patch) | |
| tree | 5af580e91f569c91a6a41d69564c390bda48f893 /src/jogl/native | |
| parent | f5bc467cfa7deebabfdab6335c6c3704bc610609 (diff) | |
FFMPEG/GLMediaPlayer: Fix compiler errors w/ new MingW 4.8.1: 'strsafe.h' -> don't use tchar.h; Fix compiler warning: Add missing (intptr_t) cast.
Diffstat (limited to 'src/jogl/native')
| -rw-r--r-- | src/jogl/native/libav/ffmpeg_dshow.c | 12 | ||||
| -rw-r--r-- | src/jogl/native/libav/ffmpeg_static.c | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/jogl/native/libav/ffmpeg_dshow.c b/src/jogl/native/libav/ffmpeg_dshow.c index 8c9903d6b..4f1523a81 100644 --- a/src/jogl/native/libav/ffmpeg_dshow.c +++ b/src/jogl/native/libav/ffmpeg_dshow.c @@ -32,8 +32,12 @@ #include <stdio.h> #include <string.h> + +// dshow includes strsafe.h, hence tchar.h cannot be used +// include strsafe.h here for documentation +// #include <tchar.h> +#include <strsafe.h> #include <dshow.h> -#include <tchar.h> static HRESULT EnumerateDevices(REFGUID category, IEnumMoniker **ppEnum) { @@ -58,9 +62,11 @@ static HRESULT EnumerateDevices(REFGUID category, IEnumMoniker **ppEnum) static void getBSTRChars(BSTR bstr, char *pDest, int destLen) { #ifdef UNICODE - _sntprintf(pDest, destLen, _T("%s"), bstr); + // _sntprintf(pDest, destLen, _T("%s"), bstr); + StringCbPrintfW(pDest, destLen, L"%s", bstr); #else - _sntprintf(pDest, destLen, _T("%S"), bstr); + // _sntprintf(pDest, destLen, _T("%S"), bstr); + StringCchPrintfA(pDest, destLen, "%S", bstr); #endif } diff --git a/src/jogl/native/libav/ffmpeg_static.c b/src/jogl/native/libav/ffmpeg_static.c index f079ee841..be5bc00b7 100644 --- a/src/jogl/native/libav/ffmpeg_static.c +++ b/src/jogl/native/libav/ffmpeg_static.c @@ -46,7 +46,7 @@ typedef unsigned (APIENTRYP AV_GET_VERSION)(void); JNIEXPORT jint JNICALL Java_jogamp_opengl_util_av_impl_FFMPEGStaticNatives_getAvVersion0 (JNIEnv *env, jclass clazz, jlong func) { if( 0 != func ) { - return (jint) ((AV_GET_VERSION)func)(); + return (jint) ((AV_GET_VERSION) (intptr_t) func)(); } else { return 0; } |