diff options
| author | wm4 <wm4@nowhere> | 2012-11-20 13:31:56 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-20 18:00:15 +0100 |
| commit | 77a77d886978a87ab2ff8f68da553d4b34b5d48b (patch) | |
| tree | ba374a6e415759cd3c9704a481ef45184c971b71 /core/cfg-mplayer.h | |
| parent | 3d41fb8e485a181cbe53ef13eb4160acab16c216 (diff) | |
| download | mpv-77a77d886978a87ab2ff8f68da553d4b34b5d48b.tar.bz2 mpv-77a77d886978a87ab2ff8f68da553d4b34b5d48b.tar.xz | |
mplayer: disable auto-loading of external codecs.conf
Do not load codecs.conf files located in $PREFIX/etc/mpv/ or ~/.mpv/.
There really is no use for this, other than possibly breaking things.
It's still possible to use --codecs-file explicitly to load an external
config file, and this option can be used in ~/.mpv/config.
While we're at it, remove the global codecs_file variable, and another
unused variable.
Diffstat (limited to 'core/cfg-mplayer.h')
| -rw-r--r-- | core/cfg-mplayer.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index 499ba3f1e3..a7f9637ebe 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -43,9 +43,6 @@ extern int stop_xscreensaver; extern int mp_msg_color; extern int mp_msg_module; -/* defined in codec-cfg.c */ -extern char *codecs_file; - /* defined in dec_video.c */ extern int field_dominance; @@ -490,7 +487,7 @@ const m_option_t common_opts[] = { {"lavdopts", (void *) lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, {"lavfdopts", (void *) lavfdopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, - {"codecs-file", &codecs_file, CONF_TYPE_STRING, 0, 0, 0, NULL}, + OPT_STRING("codecs-file", codecs_file, 0), // ------------------------- subtitles options -------------------- OPT_STRINGLIST("sub", sub_name, 0), |