summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-10-25 15:34:45 +0200
committerwm4 <wm4@nowhere>2013-10-25 18:39:15 +0200
commit28d3fe1d6d5b2731fe69d928d25715efc1e0176d (patch)
tree1ae4ec5dee3050a1cc3834f89b05089cd11af444
parent75e1c6f295ff9c0631371b6565c1d20e8f2da8b6 (diff)
downloadmpv-28d3fe1d6d5b2731fe69d928d25715efc1e0176d.tar.bz2
mpv-28d3fe1d6d5b2731fe69d928d25715efc1e0176d.tar.xz
m_config: remove unused fields
We don't need that anymore, because the old way to get default values by recreating the m_config is gone.
-rw-r--r--mpvcore/m_config.c6
-rw-r--r--mpvcore/m_config.h4
2 files changed, 1 insertions, 9 deletions
diff --git a/mpvcore/m_config.c b/mpvcore/m_config.c
index 66e5da25b7..e576ddcd5e 100644
--- a/mpvcore/m_config.c
+++ b/mpvcore/m_config.c
@@ -193,11 +193,7 @@ struct m_config *m_config_new(void *talloc_parent, size_t size,
{
struct m_config *config = talloc(talloc_parent, struct m_config);
talloc_set_destructor(config, config_destroy);
- *config = (struct m_config) {
- .optstruct_size = size,
- .optstruct_defaults = defaults,
- .options = options,
- };
+ *config = (struct m_config) {0};
// size==0 means a dummy object is created
if (size) {
config->optstruct = talloc_zero_size(config, size);
diff --git a/mpvcore/m_config.h b/mpvcore/m_config.h
index 3d82d8cd24..eaf3f6af2a 100644
--- a/mpvcore/m_config.h
+++ b/mpvcore/m_config.h
@@ -63,10 +63,6 @@ typedef struct m_config {
bool use_profiles;
int (*includefunc)(struct m_config *conf, char *filename, int flags);
- const void *optstruct_defaults;
- size_t optstruct_size;
- const struct m_option *options; // top-level options
-
void *optstruct; // struct mpopts or other
} m_config_t;