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 /cfg-mplayer.h | |
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 'cfg-mplayer.h')
-rw-r--r-- | cfg-mplayer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 8d5a0f710c..62b6eac153 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -100,6 +100,7 @@ extern int readPPOpt(void *conf, char *arg); extern void revertPPOpt(void *conf, char* opt); extern char* pp_help; extern int enable_mouse_movements; +extern int use_filedir_conf; m_option_t vd_conf[]={ {"help", "Use MPlayer with an appropriate video file instead of live partners to avoid vd.\n", CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, @@ -277,6 +278,8 @@ m_option_t mplayer_opts[]={ //---------------------- mplayer-only options ------------------------ + {"use-filedir-conf", &use_filedir_conf, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, + {"use-filedir-conf", &use_filedir_conf, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, #ifdef CRASH_DEBUG {"crash-debug", &crash_debug, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"nocrash-debug", &crash_debug, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, |