diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:11:04 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:11:04 +0300 |
commit | 95fba94860a02be5b50c4050f9ba2ac41daea3c2 (patch) | |
tree | 79ebb3fb8b351e8347c092e62331cd50b2a06a7b /mpcommon.c | |
parent | 3c2d6d9a8e28900300d20830c309eea2d511cfc8 (diff) | |
parent | 0426d5d72df81217f32147d039f3eb29c009af12 (diff) | |
download | mpv-95fba94860a02be5b50c4050f9ba2ac41daea3c2.tar.bz2 mpv-95fba94860a02be5b50c4050f9ba2ac41daea3c2.tar.xz |
Merge svn changes up to r30917
Diffstat (limited to 'mpcommon.c')
-rw-r--r-- | mpcommon.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mpcommon.c b/mpcommon.c index 59d27d9d52..789556578a 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -314,3 +314,8 @@ const m_option_t noconfig_opts[] = { {"user", &disable_user_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; + +#ifdef CONFIG_WIN32DLL +char *codec_path = NULL; +#endif + |