summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/man/en/mplayer.15
1 files changed, 4 insertions, 1 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index d6728a5276..2df8a92983 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -396,10 +396,13 @@ It has the following format:
mplayer -ao pcm:file=%10%C:test.wav test.avi
.PP
You can put all of the options in a configuration file which will be read
-every time MPlayer is run.
+every time MPlayer/MEncoder is run.
The system-wide configuration file 'mplayer.conf' is in your configuration
directory (e.g.\& /etc/\:mplayer or /usr/\:local/\:etc/\:mplayer), the user
specific one is '~/\:.mplayer/\:config'.
+The configuration file for MEncoder is 'mencoder.conf' in your configuration
+directory (e.g.\& /etc/\:mplayer or /usr/\:local/\:etc/\:mplayer), the
+user specific one is '~/\:.mplayer/\:mencoder.
User specific options override system-wide options and options given on the
command line override either.
The syntax of the configuration files is 'option=<value>', everything after