diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:42:20 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:42:20 +0300 |
| commit | 4785c2617ee9ac186464a55c1bfb13a5781ef041 (patch) | |
| tree | 2424f18b68b2037bd4e290471821e9adae28b876 /cfg-common-opts.h | |
| parent | 2732d5efbae3e0ee28bc6b70ceab1eb77e593216 (diff) | |
| parent | 38abe6ff7a3810f8e01b6296570e92df1b12b09c (diff) | |
| download | mpv-4785c2617ee9ac186464a55c1bfb13a5781ef041.tar.bz2 mpv-4785c2617ee9ac186464a55c1bfb13a5781ef041.tar.xz | |
Merge svn changes up to r30967
Diffstat (limited to 'cfg-common-opts.h')
| -rw-r--r-- | cfg-common-opts.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cfg-common-opts.h b/cfg-common-opts.h index f8ba7b446f..32395ad1c2 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -32,9 +32,7 @@ #ifdef CONFIG_PRIORITY {"priority", &proc_priority, CONF_TYPE_STRING, 0, 0, 0, NULL}, #endif -#ifdef CONFIG_WIN32DLL {"codecpath", &codec_path, CONF_TYPE_STRING, 0, 0, 0, NULL}, -#endif {"noconfig", (void *) noconfig_opts, CONF_TYPE_SUBCONFIG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 0, NULL}, // ------------------------- stream options -------------------- |