From 37e16855dbbf856945eda1fec0c886ab6d8cc891 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Mon, 6 Oct 2003 13:09:52 +0000 Subject: Ooops, I resolved the last conflict in this file wrongly CVS patchset: 5454 CVS date: 2003/10/06 13:09:52 --- src/xine-engine/audio_out.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index b60112d49..cec7eae9f 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -17,7 +17,7 @@ * along with self program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_out.c,v 1.147 2003/10/06 12:43:08 mroi Exp $ + * $Id: audio_out.c,v 1.148 2003/10/06 13:09:52 mroi Exp $ * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe @@ -1637,7 +1637,6 @@ static int ao_set_property (xine_audio_port_t *this_gen, int property, int value if (!this->grab_only) { /* Let the sound driver lock it's own mixer */ ret = this->driver->set_property(this->driver, property, value); - pthread_mutex_unlock( &this->driver_lock ); } } -- cgit v1.2.3