From: "Ronald S. Bultje" <[email protected]>

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;
-- 
1.7.7

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to