Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/mpc-hc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@gmail.com>2014-09-03 18:16:07 +0400
committerXhmikosR <xhmikosr@gmail.com>2014-09-12 12:11:32 +0400
commit5186a841fcaacec98f02219be15de3449b2befee (patch)
treed4e442d567df6319806881575f558e169ded42a3 /include
parentb02d8ee9a1275e8122ce798e2b0ca90314482767 (diff)
Update MediaInfoLib to v0.7.70.
This fixes #4733, a crash with BIK files on 64-bit.
Diffstat (limited to 'include')
-rw-r--r--include/MediaInfoDLL.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/include/MediaInfoDLL.h b/include/MediaInfoDLL.h
index e1aa96f5a..ec2634524 100644
--- a/include/MediaInfoDLL.h
+++ b/include/MediaInfoDLL.h
@@ -126,7 +126,11 @@
#elif defined(__APPLE__) && defined(__MACH__)
#define MEDIAINFODLL_NAME "libmediainfo.0.dylib"
#define __stdcall
- #include <new> //for size_t
+ #ifdef __cplusplus
+ #include <new> //for size_t
+ #else /* __cplusplus */
+ #include <stddef.h> //for size_t
+ #endif /* __cplusplus */
#else
#define MEDIAINFODLL_NAME "libmediainfo.so.0"
#define __stdcall
@@ -539,13 +543,13 @@ namespace MediaInfoDLL
const String Unable_Load_DLL = __T("Unable to load ")MEDIAINFODLL_NAME;
#define MEDIAINFO_TEST_VOID \
- if (!IsReady()) return
+ if (!MediaInfo_Module) {MediaInfoDLL_Load(); if (!MediaInfo_Module) return;}
#define MEDIAINFO_TEST_INT \
- if (!IsReady()) return 0
+ if (!MediaInfo_Module) {MediaInfoDLL_Load(); if (!MediaInfo_Module) return 0;}
#define MEDIAINFO_TEST_STRING \
- if (!IsReady()) return Unable_Load_DLL
+ if (!MediaInfo_Module) {MediaInfoDLL_Load(); if (!MediaInfo_Module) return Unable_Load_DLL;}
#define MEDIAINFO_TEST_STRING_STATIC \
- if (!MediaInfo_Module) return Unable_Load_DLL
+ if (!MediaInfo_Module) {MediaInfoDLL_Load(); if (!MediaInfo_Module) return Unable_Load_DLL;}
//---------------------------------------------------------------------------
class MediaInfo