Commit 2444fca5 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '5152196b'

* commit '5152196b':
  pthread: Avoid spurious wakeups

See: e3329474Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents e45460aa 5152196b
......@@ -63,8 +63,8 @@ typedef struct ThreadContext {
pthread_cond_t last_job_cond;
pthread_cond_t current_job_cond;
pthread_mutex_t current_job_lock;
unsigned current_execute;
int current_job;
unsigned int current_execute;
int done;
} ThreadContext;
......@@ -151,8 +151,8 @@ static void* attribute_align_arg worker(void *v)
{
AVCodecContext *avctx = v;
ThreadContext *c = avctx->thread_opaque;
unsigned last_execute = 0;
int our_job = c->job_count;
int last_execute = 0;
int thread_count = avctx->thread_count;
int self_id;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment