]> git.sesse.net Git - vlc/commitdiff
mft: Do not use LoadLibrary when building for Vista and later
authorHugo Beauzée-Luyssen <hugo@beauzee.fr>
Fri, 21 Nov 2014 12:13:08 +0000 (13:13 +0100)
committerHugo Beauzée-Luyssen <hugo@beauzee.fr>
Fri, 21 Nov 2014 16:30:48 +0000 (17:30 +0100)
modules/codec/mft.c

index 4777e8ba2a3ccae1cb66ff07992884911d061861..67a3dd66f5a1266cb99953ff9d53e0c1059362e5 100644 (file)
@@ -1088,6 +1088,7 @@ static int FindMFT(decoder_t *p_dec)
 
 static int LoadMFTLibrary(MFHandle *mf)
 {
+#if _WINNT_VER < 0x601
     mf->mfplat_dll = LoadLibrary(TEXT("mfplat.dll"));
     if (!mf->mfplat_dll)
         return VLC_EGENERIC;
@@ -1098,6 +1099,12 @@ static int LoadMFTLibrary(MFHandle *mf)
     mf->fptr_MFCreateAlignedMemoryBuffer = (void*)GetProcAddress(mf->mfplat_dll, "MFCreateAlignedMemoryBuffer");
     if (!mf->fptr_MFTEnumEx || !mf->fptr_MFCreateSample || !mf->fptr_MFCreateMemoryBuffer || !mf->fptr_MFCreateAlignedMemoryBuffer)
         return VLC_EGENERIC;
+#else
+    mf->fptr_MFTEnumEx = &MFTEnumEx;
+    mf->fptr_MFCreateSample = &MFCreateSample;
+    mf->fptr_MFCreateMemoryBuffer = &MFCreateMemoryBuffer;
+    mf->fptr_MFCreateAlignedMemoryBuffer = &MFCreateAlignedMemoryBuffer;
+#endif
 
     return VLC_SUCCESS;
 }