diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-09-02 17:18:28 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-09-02 17:18:28 +0000 |
| commit | 210a768c7afb09d8053c3a01ceeec335fdf2b897 (patch) | |
| tree | 07214d9147b83780d715d933e18d267b5f775c59 | |
| parent | 1540fedb5feb2b74f2caee529e6d69ed8585f0a2 (diff) | |
| download | mpv-210a768c7afb09d8053c3a01ceeec335fdf2b897.tar.bz2 mpv-210a768c7afb09d8053c3a01ceeec335fdf2b897.tar.xz | |
Mention the MEncoder configuration files along with the MPlayer ones.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16362 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 5 |
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 |