Merge branch 'maint' into next

[paraslash.git] / ggo / audiod.m4

diff --git a/ggo/audiod.m4 b/ggo/audiod.m4
index 5390d1b0fae1f50e5710ddb912297a47601269e7..29bce100380c44e63841c56aff734107f9b324f8 100644 (file)
--- a/ggo/audiod.m4
+++ b/ggo/audiod.m4
@@ -131,16 +131,26 @@ details="
                -r 'mp3:http -i my.host.org -p 8009'
 "
 
-
 option "no_default_filters" D
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 "Configure filters manually"
 flag off
 details="
        If (and only if) this option is set, the --filter options
-       (see below) take effect.  Otherwise, the compiled-in default
+       (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 manual filter configuration
+       because 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). In other
+       words, the fecdec filter must be specified as the first filter
+       of the filter chain for any udp stream.
 "
 
 option "filter" f
@@ -153,7 +163,7 @@ dependon="no_default_filters"
 details="
        This option may be given multiple times. The \"filter_spec\"
        consists of an audio format, the name of the filter, and any
-       options for that filter. Mote that order matters.
+       options for that filter. Note that order matters.
 
        Examples: