github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-18 21:16:10 +01:00
Code Releases Activity

The system-wide and the user-specific MEncoder configuration file should both

Browse Source 
be called 'mencoder.conf', not two different names over which code and
documentation disagree.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17870 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-03-14 23:33:37 +00:00
parent 0ba7f250d7
commit 47a665f8c9
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DOCS/man/cs/mplayer.1
View File

@ -483,7 +483,7 @@ Syst
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 @@ Syst
Uživatelské nastavení MPlayeru.
.
.TP
~/.mplayer/\:mencoder
~/.mplayer/\:mencoder.conf
Uživatelské nastavení MEncoderu.
.
.TP

2
DOCS/man/de/mplayer.1
View File

@ -9984,7 +9984,7 @@ Systemweite Einstellungen f
Benutzerspezifische Einstellungen für MPlayer
.
.TP
~/.mplayer/\:mencoder
~/.mplayer/\:mencoder.conf
Benutzerspezifische Einstellungen für MEncoder
.
.TP

4
DOCS/man/en/mplayer.1
View File

@ -476,7 +476,7 @@ 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 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 @@ MEncoder system-wide settings
MPlayer user settings
.
.TP
~/.mplayer/\:mencoder
~/.mplayer/\:mencoder.conf
MEncoder user settings
.
.TP

2
DOCS/man/fr/mplayer.1
View File

@ -499,7 +499,7 @@ l'utilisateur se trouve dans '~/\:.mplayer/\:config'.
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.

4
DOCS/man/it/mplayer.1
View File

@ -495,7 +495,7 @@ configurazione (p.es.\& /etc/\:mplayer o /usr/\:local/\:etc/\:mplayer), quello
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 di sistema globali di MEncoder
configurazioni utente di MPlayer
.
.TP
~/.mplayer/\:mencoder
~/.mplayer/\:mencoder.conf
configurazioni utente di MEncoder
.
.TP

2
DOCS/man/pl/mplayer.1
View File

@ -413,7 +413,7 @@ G
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

2
mencoder.c
View File

@ -300,7 +300,7 @@ static void mencoder_exit(int level, char *how)
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)