ARM: align stack in NEON h264 mc functions

[ffmpeg] / libavcodec / w32thread.c

diff --git a/libavcodec/w32thread.c b/libavcodec/w32thread.c
index 58533a74c447e45f26e6ce7c8eac6b240211f931..a88e3e0717248099bb08ba8d81f53f3c5c439976 100644 (file)
--- a/libavcodec/w32thread.c
+++ b/libavcodec/w32thread.c
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * 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
 
@@ -37,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(;;){
@@ -56,8 +55,8 @@ static unsigned __stdcall thread_func(void *v){
 }
 
 /**
- * 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;
@@ -70,12 +69,13 @@ void avcodec_thread_free(AVCodecContext *s){
         WaitForSingleObject(c[i].thread, INFINITE);
         if(c[i].work_sem) CloseHandle(c[i].work_sem);
         if(c[i].done_sem) CloseHandle(c[i].done_sem);
+        if(c[i].thread)   CloseHandle(c[i].thread);
     }
 
     av_freep(&s->thread_opaque);
 }
 
-int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void **arg, int *ret, int count){
+int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size){
     ThreadContext *c= s->thread_opaque;
     int i;
 
@@ -85,7 +85,7 @@ int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, vo
     /* 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++){
-        c[i].arg= arg[i];
+        c[i].arg= (char*)arg + i*size;
         c[i].func= func;
         c[i].ret= 12345;