Module: libav Branch: master Commit: f77f640b3035d357a6c6ffcea243c7ea0d8ebc67
Author: Janne Grunau <[email protected]> Committer: Janne Grunau <[email protected]> Date: Wed Dec 21 13:07:54 2011 +0100 pthreads: reset active_thread_type when slice thread_init returrns early --- libavcodec/pthread.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 7e03c64..ac15fef 100644 --- 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) _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
