From: Andre Noll <maan@systemlinux.org>
Date: Mon, 2 Jul 2012 06:52:16 +0000 (+0200)
Subject: Merge branch 't/alsa_fix'
X-Git-Tag: v0.4.11~11
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=128c594f32be41d928df432298a013a168891ab7

Merge branch 't/alsa_fix'

	3a56a6 alsa: Do not buffer more than 500ms.

Seems to work fine everywhere.
---

128c594f32be41d928df432298a013a168891ab7
diff --cc NEWS
index df54a641,0ac2240e..23ec23a3
--- a/NEWS
+++ b/NEWS
@@@ -2,11 -2,8 +2,12 @@@
  0.4.11 (to be announced) "mutual diversity"
  -------------------------------------------
  
 +	- Sideband connections: If both para_server and para_client
 +	  support this feature, data is sent as a multiplexed stream.
  	- The --no_default_filters option of para_filter has been
  	  removed.
 +	- Several fixes and latency improvements to various decoders.
++	- The alsa writer now limits the prebuffer time to 500ms.
  	- Documentation improvements.
  
  ------------------------------------------