Browse Source

pthreads: reset active_thread_type when slice thread_init returrns early

(cherry picked from commit f77f640b30)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.9.1
Janne Grunau Michael Niedermayer 14 years ago
parent
commit
4f94de84e8
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      libavcodec/pthread.c

+ 3
- 1
libavcodec/pthread.c View File

@@ -239,8 +239,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)


Loading…
Cancel
Save