eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-24 16:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

pthreads: reset active_thread_type when slice thread_init returrns early

Browse Source 
(cherry picked from commit f77f640b30)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Janne Grunau
2011-12-21 13:07:54 +01:00
committed by Michael Niedermayer
parent 9665ccda10
commit 4f94de84e8
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

@@ -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)