diff mplayer.c @ 20251:2971196cd8c6

Disable loading of file-specific configuration file from the same directory as the played file. Add a command-line switch to enable it. Patch by reimar, manpage patch by me

--- a/mplayer.c	Sun Oct 15 20:48:26 2006 +0000
+++ b/mplayer.c	Sun Oct 15 21:27:15 2006 +0000
@@ -413,6 +413,7 @@
 short edl_decision = 0; ///< 1 when an EDL operation has been made.
 FILE* edl_fd = NULL; ///< fd to write to when in -edlout mode.
 float begin_skip = MP_NOPTS_VALUE; ///< start time of the current skip while on edlout mode
+int use_filedir_conf;
 
 static unsigned int inited_flags=0;
 #define INITED_VO 1
@@ -854,7 +855,7 @@
 
     sprintf (cfg, "%s.conf", file);
     
-    if (!stat (cfg, &st))
+    if (use_filedir_conf && !stat (cfg, &st))
     {
 	mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingConfig, cfg);
 	m_config_parse_config_file (conf, cfg);