Mercurial > mplayer.hg

changeset 30915:8b78430a1249

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author sesse
date Thu, 25 Mar 2010 12:58:41 +0000
parents ce07076345c0
children c9e9b7abdb20
files loader/win32.c
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/loader/win32.c	Wed Mar 24 20:43:41 2010 +0000
+++ b/loader/win32.c	Thu Mar 25 12:58:41 2010 +0000
@@ -436,10 +436,7 @@
 
     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