Module: libav Branch: master Commit: 7b6883898ff9000b9a9e71fc1fb6e842ec850a79
Author: Ronald S. Bultje <[email protected]> Committer: Janne Grunau <[email protected]> Date: Fri Oct 14 23:47:45 2011 +0200 pthread: prevent updating AVCodecContext from itself in frame_thread_free Signed-off-by: Janne Grunau <[email protected]> --- libavcodec/pthread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 94df4ec..42f4382 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -633,7 +633,7 @@ static void frame_thread_free(AVCodecContext *avctx, int thread_count) park_frame_worker_threads(fctx, thread_count); - if (fctx->prev_thread) + if (fctx->prev_thread && fctx->prev_thread != fctx->threads) update_context_from_thread(fctx->threads->avctx, fctx->prev_thread->avctx, 0); fctx->die = 1; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
