summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-05-20 12:32:20 +0200
committerJan Ekström <jeebjp@gmail.com>2018-05-31 01:24:51 +0300
commitf022bf61a97afc8ebec7865b0463c1fbf8018b1d (patch)
tree74ddd84d6c775ca25ccd41de08772c9722f768de
parentb50d54ed409efab00866e099296729628577487d (diff)
downloadmpv-f022bf61a97afc8ebec7865b0463c1fbf8018b1d.tar.bz2
mpv-f022bf61a97afc8ebec7865b0463c1fbf8018b1d.tar.xz
m_option: remove an unused field
-rw-r--r--options/m_option.c9
-rw-r--r--options/m_option.h4
2 files changed, 0 insertions, 13 deletions
diff --git a/options/m_option.c b/options/m_option.c
index e0f3dc5c76..1fde03cccd 100644
--- a/options/m_option.c
+++ b/options/m_option.c
@@ -3019,15 +3019,6 @@ static int parse_obj_settings(struct mp_log *log, struct bstr opt, int op,
skip = true;
}
- if (_ret && desc.init_options) {
- struct m_config *config = m_config_from_obj_desc_noalloc(NULL, log, &desc);
- bstr s = bstr0(desc.init_options);
- m_obj_parse_sub_config(log, opt, str, &s, config,
- M_SETOPT_CHECK_ONLY, nopos, NULL, list, &plist);
- assert(s.len == 0);
- talloc_free(config);
- }
-
if (has_param) {
struct m_config *config = NULL;
if (!skip)
diff --git a/options/m_option.h b/options/m_option.h
index 584ad13959..750f1ac626 100644
--- a/options/m_option.h
+++ b/options/m_option.h
@@ -123,10 +123,6 @@ struct m_obj_desc {
const char *options_prefix;
// For free use by the implementer of m_obj_list.get_desc
const void *p;
- // If not NULL, options which should be set before applying other options.
- // This member is usually set by m_obj_list_find() only, and read by the
- // option parser. It's not used anywhere else.
- const char *init_options;
// Don't list entry with "help"
bool hidden;
// Callback to print custom help if "vf=entry=help" is passed