CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/DOCS/man/en In directory mail:/var2/tmp/cvs-serv7355/DOCS/man/en Modified Files: mplayer.1 Log Message: Mention the MEncoder configuration files along with the MPlayer ones. Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/man/en/mplayer.1,v retrieving revision 1.1084 retrieving revision 1.1085 diff -u -r1.1084 -r1.1085 --- mplayer.1 2 Sep 2005 16:18:33 -0000 1.1084 +++ mplayer.1 2 Sep 2005 17:18:28 -0000 1.1085 @@ -396,10 +396,13 @@ 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