[FFmpeg-cvslog] Fix compilation with win32 threads.after 'unbreak avcodec_thread_init'

Maksym Veremeyenko git at videolan.org
Wed Mar 30 12:37:11 CEST 2011


ffmpeg | branch: master | Maksym Veremeyenko <verem at m1.tv> | Wed Mar 30 12:36:15 2011 +0200| [dd9134c22ed601a97122c64f23aed56c6f96cd9a] | committer: Carl Eugen Hoyos

Fix compilation with win32 threads.after 'unbreak avcodec_thread_init'

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dd9134c22ed601a97122c64f23aed56c6f96cd9a
---

 libavcodec/w32thread.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/w32thread.c b/libavcodec/w32thread.c
index f905077..7c4c760 100644
--- a/libavcodec/w32thread.c
+++ b/libavcodec/w32thread.c
@@ -137,11 +137,11 @@ int ff_thread_init(AVCodecContext *s){
 
     s->active_thread_type= FF_THREAD_SLICE;
 
-    if (thread_count <= 1)
+    if (s->thread_count <= 1)
         return 0;
 
     assert(!s->thread_opaque);
-    c= av_mallocz(sizeof(ThreadContext)*thread_count);
+    c= av_mallocz(sizeof(ThreadContext)*s->thread_count);
     s->thread_opaque= c;
     if(!(c[0].work_sem = CreateSemaphore(NULL, 0, INT_MAX, NULL)))
         goto fail;
@@ -150,7 +150,7 @@ int ff_thread_init(AVCodecContext *s){
     if(!(c[0].done_sem = CreateSemaphore(NULL, 0, INT_MAX, NULL)))
         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);
         c[i].avctx= s;
         c[i].work_sem = c[0].work_sem;



More information about the ffmpeg-cvslog mailing list