summaryrefslogtreecommitdiffstats
path: root/m_config.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-10-12 10:17:55 +0200
committerwm4 <wm4@nowhere>2012-10-12 11:53:53 +0200
commit85d185441acf4691c830db2f40235ac927410d45 (patch)
tree211177793cd5d6b399346be661af8e7528f0f411 /m_config.h
parent65fc530f0c3ff02f982a0e4c74988d4a53730f04 (diff)
parente1b15dee4c250bf6509594e241eb2856c8d21e0f (diff)
downloadmpv-85d185441acf4691c830db2f40235ac927410d45.tar.bz2
mpv-85d185441acf4691c830db2f40235ac927410d45.tar.xz
Merge branch 'input_changes' into master
Conflicts: DOCS/man/en/vo.rst etc/input.conf input/input.c m_property.c
Diffstat (limited to 'm_config.h')
-rw-r--r--m_config.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/m_config.h b/m_config.h
index 6bb1f4ff35..9098a23c97 100644
--- a/m_config.h
+++ b/m_config.h
@@ -152,6 +152,9 @@ int m_config_parse_suboptions(struct m_config *config, char *name,
const struct m_option *m_config_get_option(const struct m_config *config,
struct bstr name);
+struct m_config_option *m_config_get_co(const struct m_config *config,
+ struct bstr name);
+
/* Print a list of all registered options.
* \param config The config object.
*/