RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

In win32 thread implementation do not access jobnr if the thread is asked 

to terminate, jobnr it does not point to a valid location in that case.

Originally committed as revision 20565 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-11-20 21:08:26 +00:00
parent 1b88277bd9
commit 9fe0894210
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/w32thread.c
View File

@ -48,16 +48,17 @@ static unsigned WINAPI attribute_align_arg thread_func(void *v){
int ret, jobnr; int ret, jobnr;
//printf("thread_func %X enter wait\n", (int)v); fflush(stdout); //printf("thread_func %X enter wait\n", (int)v); fflush(stdout);
WaitForSingleObject(c->work_sem, INFINITE); WaitForSingleObject(c->work_sem, INFINITE);
// avoid trying to access jobnr if we should quit
if (!c->func && !c->func2)
break;
WaitForSingleObject(c->job_sem, INFINITE); WaitForSingleObject(c->job_sem, INFINITE);
jobnr = (*c->jobnr)++; jobnr = (*c->jobnr)++;
ReleaseSemaphore(c->job_sem, 1, 0); ReleaseSemaphore(c->job_sem, 1, 0);
//printf("thread_func %X after wait (func=%X)\n", (int)v, (int)c->func); fflush(stdout); //printf("thread_func %X after wait (func=%X)\n", (int)v, (int)c->func); fflush(stdout);
if(c->func) if(c->func)
ret= c->func(c->avctx, (uint8_t *)c->arg + jobnr*c->argsize); ret= c->func(c->avctx, (uint8_t *)c->arg + jobnr*c->argsize);
else if (c->func2)
ret= c->func2(c->avctx, c->arg, jobnr, c->threadnr);
else else
return 0; ret= c->func2(c->avctx, c->arg, jobnr, c->threadnr);
if (c->ret) if (c->ret)
c->ret[jobnr] = ret; c->ret[jobnr] = ret;
//printf("thread_func %X signal complete\n", (int)v); fflush(stdout); //printf("thread_func %X signal complete\n", (int)v); fflush(stdout);