# HG changeset patch # User diego # Date 1125681508 0 # Node ID 341ab9ff8870b4ad3dd349e2fca7b642096ac573 # Parent e6e3e5cf583b3de5f1f1212304bc1145ecbc303f Mention the MEncoder configuration files along with the MPlayer ones. diff -r e6e3e5cf583b -r 341ab9ff8870 DOCS/man/en/mplayer.1 --- a/DOCS/man/en/mplayer.1 Fri Sep 02 17:11:00 2005 +0000 +++ b/DOCS/man/en/mplayer.1 Fri Sep 02 17:18:28 2005 +0000 @@ -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=', everything after