diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-04 19:05:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-04 19:05:25 +0200 |
| commit | fde63146d264f8de86b5cca442eaeed3d59a6681 (patch) | |
| tree | c0790c54fe310d8a3fdd626b1fca0eb2ab90928b | |
| parent | ca26c2c30fec45933fdc9a097d1326438b3c4ddc (diff) | |
| parent | 6da08c9986bf016dcf951dc39aeb45b61b32a1ac (diff) | |
| download | ffmpeg-fde63146d264f8de86b5cca442eaeed3d59a6681.tar.gz | |
Merge remote-tracking branch 'dwbuiten/master'
* dwbuiten/master:
w32threads: Make pthread_cond_wait follow POSIX
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/w32pthreads.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/w32pthreads.h b/libavcodec/w32pthreads.h index 70b84cf2e1..ae6ceb91f8 100644 --- a/libavcodec/w32pthreads.h +++ b/libavcodec/w32pthreads.h @@ -194,13 +194,13 @@ static void pthread_cond_broadcast(pthread_cond_t *cond) pthread_mutex_unlock(&win32_cond->mtx_broadcast); } -static void pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) +static int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) { win32_cond_t *win32_cond = cond->ptr; int last_waiter; if (cond_wait) { cond_wait(cond, mutex, INFINITE); - return; + return 0; } /* non native condition variables */ |