diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-10-06 13:09:52 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-10-06 13:09:52 +0000 |
| commit | 37e16855dbbf856945eda1fec0c886ab6d8cc891 (patch) | |
| tree | 59b4848b3bae5df107ec3d7772a42d9f482b4701 | |
| parent | bddec9254d8992df24f6f029e0d36c9e5ec22270 (diff) | |
| download | xine-lib-37e16855dbbf856945eda1fec0c886ab6d8cc891.tar.gz xine-lib-37e16855dbbf856945eda1fec0c886ab6d8cc891.tar.bz2 | |
Ooops, I resolved the last conflict in this file wrongly
CVS patchset: 5454
CVS date: 2003/10/06 13:09:52
| -rw-r--r-- | src/xine-engine/audio_out.c | 3 |
1 files changed, 1 insertions, 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 <andy@alsaplayer.org> @@ -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 ); } } |