From 7b6883898ff9000b9a9e71fc1fb6e842ec850a79 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Fri, 14 Oct 2011 23:47:45 +0200
Subject: [PATCH] pthread: prevent updating AVCodecContext from itself in
 frame_thread_free

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
---
 libavcodec/pthread.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 94df4ec5a2..42f4382e7d 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;