diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/mpd.conf.5 | 10 | ||||
| -rw-r--r-- | doc/mpdconf.example | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5 index 371c0d774..5a77d4944 100644 --- a/doc/mpd.conf.5 +++ b/doc/mpd.conf.5 @@ -365,9 +365,11 @@ This specifies the icecast mountpoint to use. This specifies the password to use when logging in to the icecast server. .TP .B quality <quality> -This specifies the ogg encoding quality to use. The value must be between 0 +This specifies the encoding quality to use. The value must be between 0 and 10. Fractional values, such as 2.5, are permitted. Either the quality or -the bitrate parameter must be specified, but not both. +the bitrate parameter must be specified, but not both. For Ogg, a +higher quality number produces higher quality output. For MP3, it's +just the opposite, with lower numbers producing higher quality output. .TP .B bitrate <kbps> This specifies the bitrate to use for encoding. Either the quality or the @@ -378,6 +380,10 @@ This specifies the sample rate, bits per sample, and number of channels to use for encoding. .SH OPTIONAL SHOUT OUTPUT PARAMETERS .TP +.B encoding <encoding> +This specifies which output encoding to use. Should be either "ogg" +or "mp3". The default is "ogg". +.TP .B user <username> This specifies the username to use when logging in to the icecast server. The default is "source". diff --git a/doc/mpdconf.example b/doc/mpdconf.example index be04adb91..995bba3aa 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -112,6 +112,7 @@ error_file "~/.mpd/mpd.error" # #audio_output { # type "shout" +# encoding "ogg" # name "My Shout Stream" # host "localhost" # port "8000" |