Merge commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 22:04:52 +0000 (00:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 22:04:52 +0000 (00:04 +0200)
* commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc':
  pthread: Fix deadlock during thread initialization

Conflicts:
libavcodec/pthread.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/pthread.c

index 0371d8a..8ae2c3f 100644 (file)
@@ -75,7 +75,8 @@ static void* attribute_align_arg worker(void *v)
             if (c->current_job == nb_threads + c->nb_jobs)
                 pthread_cond_signal(&c->last_job_cond);
 
-            pthread_cond_wait(&c->current_job_cond, &c->current_job_lock);
+            if (!c->done)
+                pthread_cond_wait(&c->current_job_cond, &c->current_job_lock);
             our_job = self_id;
 
             if (c->done) {