Merge.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index def102ef3..7e43fb5cf 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -287,6 +287,7 @@ struct audio_fifo_s {
   int                num_buffers;
 };
 
+static int ao_set_property (xine_audio_port_t *this_gen, int property, int value);
 
 static audio_fifo_t *fifo_new (xine_t *xine) {
 
@@ -1596,6 +1597,11 @@ static void ao_close(xine_audio_port_t *this_gen, xine_stream_t *stream) {
     xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_out: no streams left, closing driver\n");
 
     if (this->audio_loop_running) {
+      if (this->clock->speed == XINE_SPEED_PAUSE ||
+          (this->clock->speed != XINE_FINE_SPEED_NORMAL && !this->slow_fast_audio)) {
+        /* discard buffers, otherwise we'll wait forever */
+        ao_set_property(this_gen, AO_PROP_DISCARD_BUFFERS, 1);
+      }
       /* make sure there are no more buffers on queue */
       fifo_wait_empty(this->out_fifo);
     }