Mercurial > mplayer.hg

changeset 29593:78bb10138aa4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Document directory-specific configuration file.
author reimar
date Wed, 02 Sep 2009 19:44:15 +0000
parents ccdfb20713eb
children 331320b4557b
files DOCS/man/en/mplayer.1
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1	Wed Sep 02 19:43:05 2009 +0000
+++ b/DOCS/man/en/mplayer.1	Wed Sep 02 19:44:15 2009 +0000
@@ -527,6 +527,11 @@
 You can also put the configuration file in the same directory as the file to
 be played, as long as you give the \-use\-filedir\-conf option (either on the
 command line or in your global config file).
+If file-specific configuration file is found in the same directory, no file-specific
+one is loaded from ~/.mplayer.
+In addition the \-use\-filedir\-conf also enables directory-specific configuration files,
+MPlayer tries to first load a mplayer.conf from the same directory as the file played
+and then tries to load any file-specific configuration.
 .PP
 .I EXAMPLE MPLAYER CONFIGURATION FILE:
 .sp 1