highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pthreads: reset active_thread_type when slice thread_init returrns early

Browse Source
This commit is contained in:
Janne Grunau
2011-12-21 13:07:54 +01:00
parent fede015468
commit f77f640b30
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/pthread.c
View File

@ -237,8 +237,10 @@ static int thread_init(AVCodecContext *avctx)
ThreadContext *c; ThreadContext *c;
int thread_count = avctx->thread_count; int thread_count = avctx->thread_count;
if (thread_count <= 1) if (thread_count <= 1) {
avctx->active_thread_type = 0;
return 0; return 0;
}
c = av_mallocz(sizeof(ThreadContext)); c = av_mallocz(sizeof(ThreadContext));
if (!c) if (!c)