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


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20257 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 2 insertions, 1 deletions

diff --git a/mplayer.c b/mplayer.c
index 9936181966..2f56a063ff 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -413,6 +413,7 @@ short edl_muted  = 0; ///< Stores whether EDL is currently in muted mode.
 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 @@ void load_per_file_config (m_config_t* conf, const char *const file)
 
     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);