Module: libav Branch: master Commit: e524eadbf8ac568fcab7fa8f9520fad013beb91a
Author: Cheng Sun <[email protected]> Committer: Ronald S. Bultje <[email protected]> Date: Sat Nov 26 10:45:36 2011 -0800 [PATCH] Fix crash when initializing multi-threaded decoding for corrupted file. Signed-off-by: Ronald S. Bultje <[email protected]> --- libavcodec/pthread.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 3364376..dae28e6 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -651,7 +651,8 @@ static void frame_thread_free(AVCodecContext *avctx, int thread_count) pthread_cond_signal(&p->input_cond); pthread_mutex_unlock(&p->mutex); - pthread_join(p->thread, NULL); + if (p->thread) + pthread_join(p->thread, NULL); if (codec->close) codec->close(p->avctx); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
