summaryrefslogtreecommitdiffstats
path: root/mencoder.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-14 23:33:37 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-14 23:33:37 +0000
commit47a665f8c9e45cf70c988c3e59f89e5c06e3c625 (patch)
tree653f46594eee5b192448213935379cd7dbd88fb2 /mencoder.c
parent0ba7f250d72b3809fd73114a14b97124762e2340 (diff)
downloadmpv-47a665f8c9e45cf70c988c3e59f89e5c06e3c625.tar.bz2
mpv-47a665f8c9e45cf70c988c3e59f89e5c06e3c625.tar.xz
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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17870 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r--mencoder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mencoder.c b/mencoder.c
index cd76cb901f..b18cf3cb8e 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -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)