From 50cef1021ee93fcaa97b1161af7e56f6b7f7a24a Mon Sep 17 00:00:00 2001 From: eddyg Date: Mon, 6 Oct 2008 21:36:01 +0000 Subject: [PATCH] Change pthread mutex's to be explicitly NORMAL instead of relying on the default on a per OS basis. Cygwin was using RECURSIVE as a default, which does not block the caller upon a second lock. This commit fixes decomb, and slow, and slower deinterlace on Windows. git-svn-id: svn://localhost/HandBrake/trunk@1817 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- libhb/ports.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libhb/ports.c b/libhb/ports.c index cecfc562..9d5fd08b 100644 --- a/libhb/ports.c +++ b/libhb/ports.c @@ -409,7 +409,12 @@ hb_lock_t * hb_lock_init() #if defined( SYS_BEOS ) l->sem = create_sem( 1, "sem" ); #elif USE_PTHREAD - pthread_mutex_init( &l->mutex, NULL ); + pthread_mutexattr_t mta; + + pthread_mutexattr_init(&mta); + pthread_mutexattr_settype(&mta, PTHREAD_MUTEX_NORMAL); + + pthread_mutex_init( &l->mutex, &mta ); //#elif defined( SYS_CYGWIN ) // l->mutex = CreateMutex( 0, FALSE, 0 ); #endif -- 2.11.0