Merge commit 'eb90a209'

* commit 'eb90a209':
  pthread: Fix deadlock during thread initialization

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

libavfilter/pthread.c

@@ -75,6 +75,7 @@ static void* attribute_align_arg worker(void *v)
             if (c->current_job == nb_threads + c->nb_jobs)
                 pthread_cond_signal(&c->last_job_cond);
 
+            if (!c->done)
                 pthread_cond_wait(&c->current_job_cond, &c->current_job_lock);
             our_job = self_id;