diff options
author | wm4 <wm4@nowhere> | 2012-10-16 07:30:30 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-10-16 07:30:30 +0200 |
commit | 4e89851aa128a614f59ff4885af384a266cb24e6 (patch) | |
tree | c6ab9f34ef3e9c1d58f8ec837b93e249e79bdcf6 /m_config.h | |
parent | f45eab6faea05834c1337175dbe51437707b8d7e (diff) | |
parent | 6557f206efeb4569a42f1e4810172bc97fd64619 (diff) | |
download | mpv-4e89851aa128a614f59ff4885af384a266cb24e6.tar.bz2 mpv-4e89851aa128a614f59ff4885af384a266cb24e6.tar.xz |
Merge branch 'master' into osd_changes
Conflicts:
Makefile
command.c
libvo/gl_common.c
libvo/vo_corevideo.m
libvo/vo_opengl.c
libvo/vo_opengl_old.c
libvo/vo_opengl_shaders.glsl
sub/ass_mp.c
sub/osd_libass.c
sub/sd_ass.c
Diffstat (limited to 'm_config.h')
-rw-r--r-- | m_config.h | 3 |
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. */ |