aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/w32pthreads.h
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2012-04-03 17:36:49 -0400
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2012-04-04 13:04:38 -0400
commit91dffb4c1dfc7232e74ab86536afe39a777fc12d (patch)
tree1713cef7bda9142e4ce6fdb68b03f88002a0b5df /libavcodec/w32pthreads.h
parent3dde147ff92764b907db49b5237df7fd26359444 (diff)
downloadandroid_external_ffmpeg-91dffb4c1dfc7232e74ab86536afe39a777fc12d.tar.gz
android_external_ffmpeg-91dffb4c1dfc7232e74ab86536afe39a777fc12d.tar.bz2
android_external_ffmpeg-91dffb4c1dfc7232e74ab86536afe39a777fc12d.zip
w32threads: Make pthread_cond_wait follow POSIX
pthread_cond_wait is supposed to return an integer, and indeed does sometimes. Fix its function declaration to match its behavior and POSIX. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/w32pthreads.h')
-rw-r--r--libavcodec/w32pthreads.h4
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 */