[MPlayer-cvslog] r30957 - trunk/loader/win32.c

[sesse]

Author: sesse
Date: Thu Mar 25 13:58:41 2010
New Revision: 30957

Log:
Don't try to delete the global memory mutex in the Win32 loader code,
since it's now statically allocated and will not be reallocated if a new
allocation comes along.

This also fixes an issue where the mutex would not always be properly
unlocked, leading to deadlocks. I thought I'd committed that ages ago,
but obviously not, and it broke CineForm initialization.

Modified:
   trunk/loader/win32.c

Modified: trunk/loader/win32.c
==============================================================================
--- trunk/loader/win32.c	Wed Mar 24 21:43:41 2010	(r30956)
+++ trunk/loader/win32.c	Thu Mar 25 13:58:41 2010	(r30957)
@@ -436,10 +436,7 @@ static int my_release(void* memory)
 
     alccnt--;
 
-    if (last_alloc)
-	pthread_mutex_unlock(&memmut);
-    else
-	pthread_mutex_destroy(&memmut);
+    pthread_mutex_unlock(&memmut);
 
     //if (alccnt < 40000) printf("MY_RELEASE: %p\t%ld    (%d)\n", header, header->size, alccnt);
 #else