Commit 7b688389 authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by Janne Grunau

pthread: prevent updating AVCodecContext from itself in frame_thread_free

Signed-off-by: 's avatarJanne Grunau <janne-libav@jannau.net>
parent feadcd1b
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment