pthreads: fix segfault due to the thread beimg killed before it has been allocated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago · 61c2cec957
parent cb8db6423a
commit 61c2cec957
1 changed files with 2 additions and 1 deletions
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@ -658,6 +658,7 @@ static void frame_thread_free(AVCodecContext *avctx, int thread_count)
        pthread_cond_signal(&p->input_cond);
        pthread_mutex_unlock(&p->mutex);

+        if(p->thread)
            pthread_join(p->thread, NULL);

        if (codec->close)