mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-17 20:17:55 +02:00
Fix compilation with win32 threads.after 'unbreak avcodec_thread_init'
This commit is contained in:
parent
3efaa24f85
commit
dd9134c22e
@ -137,11 +137,11 @@ int ff_thread_init(AVCodecContext *s){
|
|||||||
|
|
||||||
s->active_thread_type= FF_THREAD_SLICE;
|
s->active_thread_type= FF_THREAD_SLICE;
|
||||||
|
|
||||||
if (thread_count <= 1)
|
if (s->thread_count <= 1)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
assert(!s->thread_opaque);
|
assert(!s->thread_opaque);
|
||||||
c= av_mallocz(sizeof(ThreadContext)*thread_count);
|
c= av_mallocz(sizeof(ThreadContext)*s->thread_count);
|
||||||
s->thread_opaque= c;
|
s->thread_opaque= c;
|
||||||
if(!(c[0].work_sem = CreateSemaphore(NULL, 0, INT_MAX, NULL)))
|
if(!(c[0].work_sem = CreateSemaphore(NULL, 0, INT_MAX, NULL)))
|
||||||
goto fail;
|
goto fail;
|
||||||
@ -150,7 +150,7 @@ int ff_thread_init(AVCodecContext *s){
|
|||||||
if(!(c[0].done_sem = CreateSemaphore(NULL, 0, INT_MAX, NULL)))
|
if(!(c[0].done_sem = CreateSemaphore(NULL, 0, INT_MAX, NULL)))
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
for(i=0; i<thread_count; i++){
|
for(i=0; i<s->thread_count; i++){
|
||||||
//printf("init semaphors %d\n", i); fflush(stdout);
|
//printf("init semaphors %d\n", i); fflush(stdout);
|
||||||
c[i].avctx= s;
|
c[i].avctx= s;
|
||||||
c[i].work_sem = c[0].work_sem;
|
c[i].work_sem = c[0].work_sem;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user