summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/pthread.c3
-rw-r--r--libavfilter/pthread.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index f4795f3444..b0d9e27aa9 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -152,7 +152,8 @@ static void* attribute_align_arg worker(void *v)
if (c->current_job == thread_count + c->job_count)
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) {
diff --git a/libavfilter/pthread.c b/libavfilter/pthread.c
index a4f45c82cd..17e8e7b20f 100644
--- a/libavfilter/pthread.c
+++ b/libavfilter/pthread.c
@@ -73,7 +73,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) {