Add support for Acelp.net fourcc and codecid, remuxing wav to avi should work

[ffmpeg] / libavcodec / w32thread.c

diff --git a/libavcodec/w32thread.c b/libavcodec/w32thread.c
index 186e302dc80c0d6dcc4e1d69f5a180019ca55249..5758c692ab3b5c2bf4a34c8dacc457995060a432 100644 (file)
--- a/libavcodec/w32thread.c
+++ b/libavcodec/w32thread.c
@@ -1,25 +1,25 @@
 /*
  * Copyright (c) 2004 Michael Niedermayer <michaelni@gmx.at>
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 //#define DEBUG
 
 #include "avcodec.h"
-#include "common.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -36,7 +36,7 @@ typedef struct ThreadContext{
 }ThreadContext;
 
 
-static unsigned __stdcall thread_func(void *v){
+static unsigned WINAPI attribute_align_arg thread_func(void *v){
     ThreadContext *c= v;
 
     for(;;){
@@ -50,20 +50,20 @@ static unsigned __stdcall thread_func(void *v){
 //printf("thread_func %X signal complete\n", (int)v); fflush(stdout);
         ReleaseSemaphore(c->done_sem, 1, 0);
     }
-    
+
     return 0;
 }
 
 /**
- * free what has been allocated by avcodec_thread_init().
- * must be called after decoding has finished, especially dont call while avcodec_thread_execute() is running
+ * Free what has been allocated by avcodec_thread_init().
+ * Must be called after decoding has finished, especially do not call while avcodec_thread_execute() is running.
  */
 void avcodec_thread_free(AVCodecContext *s){
     ThreadContext *c= s->thread_opaque;
     int i;
 
     for(i=0; i<s->thread_count; i++){
-        
+
         c[i].func= NULL;
         ReleaseSemaphore(c[i].work_sem, 1, 0);
         WaitForSingleObject(c[i].thread, INFINITE);
@@ -77,10 +77,10 @@ void avcodec_thread_free(AVCodecContext *s){
 int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void **arg, int *ret, int count){
     ThreadContext *c= s->thread_opaque;
     int i;
-    
+
     assert(s == c->avctx);
     assert(count <= s->thread_count);
-    
+
     /* note, we can be certain that this is not called with the same AVCodecContext by different threads at the same time */
 
     for(i=0; i<count; i++){
@@ -92,7 +92,7 @@ int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, vo
     }
     for(i=0; i<count; i++){
         WaitForSingleObject(c[i].done_sem, INFINITE);
-        
+
         c[i].func= NULL;
         if(ret) ret[i]= c[i].ret;
     }
@@ -109,7 +109,7 @@ int avcodec_thread_init(AVCodecContext *s, int thread_count){
     assert(!s->thread_opaque);
     c= av_mallocz(sizeof(ThreadContext)*thread_count);
     s->thread_opaque= c;
-    
+
     for(i=0; i<thread_count; i++){
 //printf("init semaphors %d\n", i); fflush(stdout);
         c[i].avctx= s;
@@ -124,7 +124,7 @@ int avcodec_thread_init(AVCodecContext *s, int thread_count){
         if( !c[i].thread ) goto fail;
     }
 //printf("init done\n"); fflush(stdout);
-    
+
     s->execute= avcodec_thread_execute;
 
     return 0;