pthreads: reset active_thread_type when slice thread_init returrns early

f77f640b · Janne Grunau · fede0154 · f77f640b
Commit f77f640b authored Dec 21, 2011 by Janne Grunau
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

pthread.c libavcodec/pthread.c +3 -1

No files found.
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -237,8 +237,10 @@ static int thread_init(AVCodecContext *avctx)
    ThreadContext *c;
    int thread_count = avctx->thread_count;

-    if (thread_count <= 1)
+    if (thread_count <= 1) {
+        avctx->active_thread_type = 0;
        return 0;
+    }

    c = av_mallocz(sizeof(ThreadContext));
    if (!c)