diff options
author | rtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-15 21:27:15 +0000 |
---|---|---|
committer | rtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-15 21:27:15 +0000 |
commit | c844ece6d45709dbca432020a5c6548ab0c07a02 (patch) | |
tree | 92ec305525d43b85d40c6edc77f6d6d04e0da829 /mplayer.c | |
parent | 40f9cdbdd8c9ae474cf61270354ebc1b12aa5c47 (diff) | |
download | mpv-c844ece6d45709dbca432020a5c6548ab0c07a02.tar.bz2 mpv-c844ece6d45709dbca432020a5c6548ab0c07a02.tar.xz |
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
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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); |