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/codec-cfg.c | |
| 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/codec-cfg.c')
| -rw-r--r-- | core/codec-cfg.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/codec-cfg.c b/core/codec-cfg.c index c8fc3c74bb..91e56d6e25 100644 --- a/core/codec-cfg.c +++ b/core/codec-cfg.c @@ -59,9 +59,6 @@ static const struct bstr builtin_codecs_conf = { #define TYPE_VIDEO 0 #define TYPE_AUDIO 1 -static int codecs_conf_release; -char * codecs_file = NULL; - static int add_to_fourcc(char *s, char *alias, unsigned int *fourcc, unsigned int *map) { @@ -383,7 +380,6 @@ int parse_codec_cfg(const char *cfgfile) tmp = atoi(token[0]); if (tmp < codec_cfg_min) goto err_out_release_num; - codecs_conf_release = tmp; while ((tmp = get_token(1, 1)) == RET_EOL) /* NOTHING */; if (tmp == RET_EOF) |