From patchwork Sun Jul 31 12:11:29 2005 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "C.Y.M" X-Patchwork-Id: 11959 Received: from c-24-10-6-146.hsd1.ca.comcast.net ([24.10.6.146] helo=nofear.bounceme.net) by www.linuxtv.org with esmtp (Exim 4.34) id 1DzCef-0001aP-MJ for vdr@linuxtv.org; Sun, 31 Jul 2005 14:10:58 +0200 Received: from [10.1.1.66] (hades [10.1.1.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by nofear.bounceme.net (Postfix) with ESMTP id 5A4827356D for ; Sun, 31 Jul 2005 05:10:23 -0700 (PDT) Message-ID: <42ECBFF1.7040001@syphir.sytes.net> Date: Sun, 31 Jul 2005 05:11:29 -0700 From: "C.Y.M" Organization: CooLNeT User-Agent: Mozilla Thunderbird 1.0.6 (Windows/20050716) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Vdr X-Enigmail-Version: 0.92.0.0 Subject: [vdr] xine-lib patch fails with current cvs X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: syphir@syphir.sytes.net, Klaus Schmidinger's VDR List-Id: Klaus Schmidinger's VDR List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Jul 2005 12:10:58 -0000 Status: O X-Status: X-Keywords: X-UID: 3854 Would this change be OK? The following hunk failed with the current xine-lib.patch so I changed it like this and would like to know if this change is correct: Note that the current cvs of xine-lib's pthread_mutex_init is using &attr now (instead of NULL). Best Regards, C. --- xine-lib/src/xine-engine/xine.c.orig 2005-07-31 04:00:10.000000000 -0700 +++ xine-lib/src/xine-engine/xine.c 2005-07-31 04:12:41.000000000 -0700 @@ -536,7 +537,7 @@ */ pthread_mutexattr_init(&attr); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); - pthread_mutex_init (&stream->frontend_lock, &attr); + _x_rmutex_init (&stream->frontend_lock); /* * Clear meta/stream info