[FFmpeg-cvslog] w32thread: call ResetEvent() in pthread_cond_broadcast().
Sergey Radionov
git at videolan.org
Sat Dec 24 01:00:29 CET 2011
ffmpeg | branch: master | Sergey Radionov <rsatom at gmail.com> | Fri Dec 23 10:37:48 2011 +0700| [01eb9805f37835e20501134ae26e379140fe3239] | committer: Ronald S. Bultje
w32thread: call ResetEvent() in pthread_cond_broadcast().
Also add "volatile" to broadcast flag (since it is used from
multiple threads).
Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01eb9805f37835e20501134ae26e379140fe3239
---
libavcodec/w32pthreads.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/libavcodec/w32pthreads.h b/libavcodec/w32pthreads.h
index 3cdbc2c..70b84cf 100644
--- a/libavcodec/w32pthreads.h
+++ b/libavcodec/w32pthreads.h
@@ -120,7 +120,7 @@ typedef struct {
volatile int waiter_count;
HANDLE semaphore;
HANDLE waiters_done;
- int is_broadcast;
+ volatile int is_broadcast;
} win32_cond_t;
static void pthread_cond_init(pthread_cond_t *cond, const void *unused_attr)
@@ -187,6 +187,7 @@ static void pthread_cond_broadcast(pthread_cond_t *cond)
ReleaseSemaphore(win32_cond->semaphore, win32_cond->waiter_count, NULL);
pthread_mutex_unlock(&win32_cond->mtx_waiter_count);
WaitForSingleObject(win32_cond->waiters_done, INFINITE);
+ ResetEvent(win32_cond->waiters_done);
win32_cond->is_broadcast = 0;
} else
pthread_mutex_unlock(&win32_cond->mtx_waiter_count);
More information about the ffmpeg-cvslog
mailing list