Merge branch 't/libao'

[paraslash.git] / ggo / audiod.m4

diff --git a/ggo/audiod.m4 b/ggo/audiod.m4
index 289917c3fddfb96debfd9e8425b005b97276b532..1b5008540af26a18166e38dfaec6b3eca839171d 100644 (file)
--- a/ggo/audiod.m4
+++ b/ggo/audiod.m4
@@ -104,7 +104,7 @@ details="
        Check the clock difference between the host running para_server
        and the local host running para_audiod that many times before
        starting any stream I/0. Set this to non-zero for non-local
-       setups if the clocks of these two hosts are not syncronized
+       setups if the clocks of these two hosts are not synchronized
        by ntp or similar.
 "
 
@@ -136,22 +136,23 @@ option "no_default_filters" D
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 "Configure filters manually"
 flag off
-details="
+details = "
        If (and only if) this option is set, the --filter options
-       (see below) take effect. Otherwise, the compiled-in default
-       filters mp3dec, oggdec and aacdec are activated for mp3, ogg,
-       aac streams respectively.
-
-       You have to configure filters manually if you want to use
-       the amp filter or the compress filter which are not activated
-       by default.
-
-       Playing udp streams also requires that the output of the udp
-       receiver must be fed into the fecdec filter first to produce
-       a stream which can be decoded by the appropriate decoder
-       (mp3dec, oggdec, aacdec, wmadec). In other words, the fecdec
-       filter should be specified as the first filter of the filter
-       configuration for udp streaming.
+       (see below) take effect. Otherwise, the compiled-in defaults
+       apply.  These defaults depend on the receiver being used as
+       described below.
+
+       For http streams, only a single filter per audio format,
+       the decoder for that format, is activated. On the other hand,
+       since udp and dccp streams are sent fec-encoded by para_server,
+       the client side must feed the output of the receiver into
+       the fecdec filter first. Therefore the default for udp and
+       dccp streams is to activate the fecdec filter, followed by
+       the appropriate decoder.
+
+       You must give this option if you want to use any other filter,
+       for example the amp or the compress filter.
+
 "
 
 option "filter" f