diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-20 10:52:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-20 10:52:19 +0200 |
| commit | faac955d9b7abf1c17dd76df6a8f2f3644ef5099 (patch) | |
| tree | c679a975dc80a3c2102316c2e55ce7d771cfdf02 | |
| parent | 2afcd16711e029185288375f0bf9946d406bb0db (diff) | |
| parent | c360fb174b01170ab3fd3048d4d0acb44aa4e834 (diff) | |
| download | ffmpeg-faac955d9b7abf1c17dd76df6a8f2f3644ef5099.tar.gz | |
Merge commit 'c360fb174b01170ab3fd3048d4d0acb44aa4e834'
* commit 'c360fb174b01170ab3fd3048d4d0acb44aa4e834':
win32: Do not use GetProcAddress when compiled for Vista+
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/w32pthreads.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/w32pthreads.h b/libavcodec/w32pthreads.h index 29185c71ec..11ee2faee8 100644 --- a/libavcodec/w32pthreads.h +++ b/libavcodec/w32pthreads.h @@ -257,6 +257,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 = @@ -267,6 +268,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 */ |