From 0aed4f81fe5b9b15ab9b35baa4300f29ab03d65f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 18 Jun 2011 21:59:11 +0200 Subject: [PATCH] w32threads: with only 1 thread there cant be a active threading mode. Fixes ticket284 Signed-off-by: Michael Niedermayer --- libavcodec/w32thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/w32thread.c b/libavcodec/w32thread.c index 7c4c760e6c..501f0cebf3 100644 --- a/libavcodec/w32thread.c +++ b/libavcodec/w32thread.c @@ -135,11 +135,11 @@ int ff_thread_init(AVCodecContext *s){ return 0; } - s->active_thread_type= FF_THREAD_SLICE; - if (s->thread_count <= 1) return 0; + s->active_thread_type= FF_THREAD_SLICE; + assert(!s->thread_opaque); c= av_mallocz(sizeof(ThreadContext)*s->thread_count); s->thread_opaque= c;