diff options
| author | Sergey Radionov <rsatom@gmail.com> | 2011-12-23 10:37:48 +0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-03 22:26:47 +0100 |
| commit | 4a4e4b8139acf30bf57a8d5ad2fda2d68f6ad55f (patch) | |
| tree | 0d153bd5ef6dc816f8d81339a2b183894f8412ef | |
| parent | 33636442e2f44c2dcffd4331085ae7de93f0abe0 (diff) | |
| download | ffmpeg-4a4e4b8139acf30bf57a8d5ad2fda2d68f6ad55f.tar.gz | |
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@gmail.com>
(cherry picked from commit 01eb9805f37835e20501134ae26e379140fe3239)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/w32pthreads.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/w32pthreads.h b/libavcodec/w32pthreads.h index 3cdbc2c343..70b84cf2e1 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); |