diff options
| author | sesse <sesse@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-03-25 12:58:41 +0000 |
|---|---|---|
| committer | sesse <sesse@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-03-25 12:58:41 +0000 |
| commit | af6fb3740ea89f724c1d3cf4e3fd22cf8850ffba (patch) | |
| tree | 3f8057b5df8fb846cb10b332e7ac48c5b11c22b2 /loader/win32.c | |
| parent | a630204d0aa9fc2733264cf7c3122026e1d5f964 (diff) | |
| download | mpv-af6fb3740ea89f724c1d3cf4e3fd22cf8850ffba.tar.bz2 mpv-af6fb3740ea89f724c1d3cf4e3fd22cf8850ffba.tar.xz | |
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.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30957 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader/win32.c')
| -rw-r--r-- | loader/win32.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/loader/win32.c b/loader/win32.c index 99f8ffd991..0b1999a043 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -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 |