win32: Do not use GetProcAddress when compiled for Vista+
authorJean-Baptiste Kempf <jb@videolan.org>
Tue, 14 May 2013 09:34:53 +0000 (11:34 +0200)
committerMartin Storsjö <martin@martin.st>
Sun, 19 May 2013 15:22:39 +0000 (18:22 +0300)
Instead link directly to the condition variable functions.

Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/w32pthreads.h

index 91e7353..c58da49 100644 (file)
@@ -256,6 +256,7 @@ static void pthread_cond_signal(pthread_cond_t *cond)
 
 static void w32thread_init(void)
 {
+#if _WIN32_WINNT < 0x0600
     HANDLE kernel_dll = GetModuleHandle(TEXT("kernel32.dll"));
     /* if one is available, then they should all be available */
     cond_init      =
@@ -266,6 +267,13 @@ static void w32thread_init(void)
         (void*)GetProcAddress(kernel_dll, "WakeConditionVariable");
     cond_wait      =
         (void*)GetProcAddress(kernel_dll, "SleepConditionVariableCS");
+#else
+    cond_init      = InitializeConditionVariable;
+    cond_broadcast = WakeAllConditionVariable;
+    cond_signal    = WakeConditionVariable;
+    cond_wait      = SleepConditionVariableCS;
+#endif
+
 }
 
 #endif /* AVCODEC_W32PTHREADS_H */