From: Hendrik Leppkes <h.leppkes@gmail.com>
Date: Sat, 10 Oct 2015 07:45:44 +0000 (+0200)
Subject: Merge commit '2830bce47e2eb29c76202f19017031ddc1f95dd3'
X-Git-Tag: android-x86-7.1-r1~8642
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9d6873a43d2085e64651ffe9bf343d0dde182e93;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '2830bce47e2eb29c76202f19017031ddc1f95dd3'

* commit '2830bce47e2eb29c76202f19017031ddc1f95dd3':
  w32pthreads: Load dynamically loaded functions on demand

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
---

9d6873a43d2085e64651ffe9bf343d0dde182e93
diff --cc compat/w32pthreads.h
index 700a726e87,ac9a8142f4..2aff72ae99
--- a/compat/w32pthreads.h
+++ b/compat/w32pthreads.h
@@@ -241,12 -240,15 +248,15 @@@ static void (WINAPI *cond_signal)(pthre
  static BOOL (WINAPI *cond_wait)(pthread_cond_t *cond, pthread_mutex_t *mutex,
                                  DWORD milliseconds);
  
 -static av_unused void pthread_cond_init(pthread_cond_t *cond, const void *unused_attr)
 +static av_unused int pthread_cond_init(pthread_cond_t *cond, const void *unused_attr)
  {
      win32_cond_t *win32_cond = NULL;
+ 
+     w32thread_once_fallback(&w32thread_init_state, w32thread_init);
+ 
      if (cond_init) {
          cond_init(cond);
 -        return;
 +        return 0;
      }
  
      /* non native condition variables */