summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibaut Mattern <thibaut.mattern@gmail.com>2008-01-24 19:28:43 +0100
committerThibaut Mattern <thibaut.mattern@gmail.com>2008-01-24 19:28:43 +0100
commita6e720ee0284c0c9ec6eb5894ab8e87ee1e53f09 (patch)
tree10182364fffaa446e1b3ce615751c66a9856d964
parent3a3fa364d3380c95f453f8f225a601279d8ed056 (diff)
downloadxine-lib-a6e720ee0284c0c9ec6eb5894ab8e87ee1e53f09.tar.gz
xine-lib-a6e720ee0284c0c9ec6eb5894ab8e87ee1e53f09.tar.bz2
Don't discard audio samples forever. Fixed streaming playback
-rw-r--r--ChangeLog1
-rw-r--r--src/xine-engine/audio_out.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3dfa097e0..2b88720f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ xine-lib (1.1.10) (unreleased)
Consequently, xine-config now requires pkg-config.
* Sanity-check ASF header sizes. This fixes a crash in the ASF demuxer,
caused by the example exploit given for CVE-2006-1664.
+ * Don't discard audio samples forever. Fixed streaming playback.
xine-lib (1.1.9.1) 2008-01-11
* Security fixes:
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index 7fe92d9fe..e9bda70fb 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -1619,6 +1619,7 @@ static void ao_close(xine_audio_port_t *this_gen, xine_stream_t *stream) {
}
/* make sure there are no more buffers on queue */
fifo_wait_empty(this->out_fifo);
+ ao_set_property(this_gen, AO_PROP_DISCARD_BUFFERS, 0);
}
pthread_mutex_lock( &this->driver_lock );