# HG changeset patch
# User diego
# Date 1142379217 0
# Node ID 9e1b5526b0da8d7d168a72231d049653207ac3ba
# Parent  03f12c4dac0d27b84265c8f9603fb547d1aa9a14
The system-wide and the user-specific MEncoder configuration file should both
be called 'mencoder.conf', not two different names over which code and
documentation disagree.

diff -r 03f12c4dac0d -r 9e1b5526b0da DOCS/man/cs/mplayer.1
--- a/DOCS/man/cs/mplayer.1	Tue Mar 14 22:15:24 2006 +0000
+++ b/DOCS/man/cs/mplayer.1	Tue Mar 14 23:33:37 2006 +0000
@@ -483,7 +483,7 @@
 konfiguraèní soubor je pak '~/\:.mplayer/\:config'.
 Konfiguraèní soubor MEncoderu je 'mencoder.conf' v konfiguraèním adresáøi
 (napø\& /etc/\:mplayer nebo /usr/\:local/\:etc/\:mplayer), u¾ivatelský
-je pak '~/\:.mplayer/\:mencoder'.
+je pak '~/\:.mplayer/\:mencoder.conf'.
 U¾ivatelské volby pøebijí systémové volby a pøíkazový øádek pøebije v¹e.
 Syntax konfiguraèního souboru je 'volba=<hodnota>', v¹ecko za '#' je pova¾ováno
 za komentáø.
@@ -9473,7 +9473,7 @@
 U¾ivatelské nastavení MPlayeru.
 .
 .TP
-~/.mplayer/\:mencoder
+~/.mplayer/\:mencoder.conf
 U¾ivatelské nastavení MEncoderu.
 .
 .TP
diff -r 03f12c4dac0d -r 9e1b5526b0da DOCS/man/de/mplayer.1
--- a/DOCS/man/de/mplayer.1	Tue Mar 14 22:15:24 2006 +0000
+++ b/DOCS/man/de/mplayer.1	Tue Mar 14 23:33:37 2006 +0000
@@ -9984,7 +9984,7 @@
 Benutzerspezifische Einstellungen für MPlayer
 .
 .TP
-~/.mplayer/\:mencoder
+~/.mplayer/\:mencoder.conf
 Benutzerspezifische Einstellungen für MEncoder
 .
 .TP
diff -r 03f12c4dac0d -r 9e1b5526b0da DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Tue Mar 14 22:15:24 2006 +0000
+++ b/DOCS/man/en/mplayer.1	Tue Mar 14 23:33:37 2006 +0000
@@ -476,7 +476,7 @@
 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 one is '~/\:.mplayer/\:mencoder.conf.
 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
@@ -9560,7 +9560,7 @@
 MPlayer user settings
 .
 .TP
-~/.mplayer/\:mencoder
+~/.mplayer/\:mencoder.conf
 MEncoder user settings
 .
 .TP
diff -r 03f12c4dac0d -r 9e1b5526b0da DOCS/man/fr/mplayer.1
--- a/DOCS/man/fr/mplayer.1	Tue Mar 14 22:15:24 2006 +0000
+++ b/DOCS/man/fr/mplayer.1	Tue Mar 14 23:33:37 2006 +0000
@@ -499,7 +499,7 @@
 Le fichier de configuration pour MEncoder est 'mencoder.conf' qui se trouve
 dans le répertoire habituel des fichiers de configuration (par ex.\&
 /etc/\:mplayer ou /usr/\:local/\:etc/\:mplayer), et le fichier de
-configuration spécifique à l'utilisateur est '~/\:.mplayer/\:mencoder.
+configuration spécifique à l'utilisateur est '~/\:.mplayer/\:mencoder.conf.
 Les options du fichier utilisateur ont priorité sur les options du fichier
 global, et les options données sur la ligne de commande ont priorité sur tous
 les fichiers.
diff -r 03f12c4dac0d -r 9e1b5526b0da DOCS/man/it/mplayer.1
--- a/DOCS/man/it/mplayer.1	Tue Mar 14 22:15:24 2006 +0000
+++ b/DOCS/man/it/mplayer.1	Tue Mar 14 23:33:37 2006 +0000
@@ -495,7 +495,7 @@
 specifico dell'utente è '~/\:.mplayer/\:config'.
 Il file di configurazione per MEncoder è 'mencoder.conf' nella tua directory di
 configurazione (p.es.\& /etc/\:mplayer o /usr/\:local/\:etc/\:mplayer), quello
-specifico dell'utente è '~/\:.mplayer/\:mencoder'.
+specifico dell'utente è '~/\:.mplayer/\:mencoder.conf'.
 Le opzioni del file utente hanno precedenza sulle opzioni globali e le opzioni
 della linea di comando hanno precedenza su quelle specificate in entrambi i file.
 La sintassi del file di configurazione è 'option=<valore>', tutto quello che
@@ -9888,7 +9888,7 @@
 configurazioni utente di MPlayer
 .
 .TP
-~/.mplayer/\:mencoder
+~/.mplayer/\:mencoder.conf
 configurazioni utente di MEncoder
 .
 .TP
diff -r 03f12c4dac0d -r 9e1b5526b0da DOCS/man/pl/mplayer.1
--- a/DOCS/man/pl/mplayer.1	Tue Mar 14 22:15:24 2006 +0000
+++ b/DOCS/man/pl/mplayer.1	Tue Mar 14 23:33:37 2006 +0000
@@ -413,7 +413,7 @@
 u¿ytkownika to "~/\:.mplayer/\:config".
 Zbiorem konfiguracyjnym MEncodera jest "mencoder.conf" w katalogu
 konfiguracyjnym (np.\& /etc/\:mplayer lub /usr/\:local/\:etc/\:mplayer),
-a specyficzny dla u¿ytkownika to "~/\:.mplayer/\:mencoder".
+a specyficzny dla u¿ytkownika to "~/\:.mplayer/\:mencoder.conf".
 Opcje okre¶lone przez u¿ytkownika uniewa¿niaj± opcje z g³ównego zbioru, a opcje
 podawane z wiersza poleceñ uniewa¿niaj± obie.
 Sk³adnia zbioru konfiguracyjnego to "opcja=<warto¶æ>", wszystko po "#" uwa¿ane
diff -r 03f12c4dac0d -r 9e1b5526b0da mencoder.c
--- a/mencoder.c	Tue Mar 14 22:15:24 2006 +0000
+++ b/mencoder.c	Tue Mar 14 23:33:37 2006 +0000
@@ -300,7 +300,7 @@
 void parse_cfgfiles( m_config_t* conf )
 {
   char *conffile;
-  if ((conffile = get_path("mencoder")) == NULL) {
+  if ((conffile = get_path("mencoder.conf")) == NULL) {
     mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem);
   } else {
     if (m_config_parse_config_file(conf, conffile) < 0)