summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-03-25 18:13:04 +0100
committerwm4 <wm4@nowhere>2017-03-25 18:13:04 +0100
commitb0086d62432952ac510dd1e2747e20a75e85f899 (patch)
treec09460e5c8d4ba9a5d035ca42d51b0f872ca398c
parent7d424b4ce45534ade52f38df68308498decc0171 (diff)
downloadmpv-b0086d62432952ac510dd1e2747e20a75e85f899.tar.bz2
mpv-b0086d62432952ac510dd1e2747e20a75e85f899.tar.xz
m_option: consistent af/vf filter entry "enabled" flag default value
It should default to true, but setting the filter list via mpv_node (relevant for client API and Lua scripting) left it to false. Also "document" the flag.
-rw-r--r--DOCS/man/input.rst1
-rw-r--r--options/m_option.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst
index d252bb93a1..12193843ff 100644
--- a/DOCS/man/input.rst
+++ b/DOCS/man/input.rst
@@ -1800,6 +1800,7 @@ Property list
MPV_FORMAT_NODE_MAP (for each filter entry)
"name" MPV_FORMAT_STRING
"label" MPV_FORMAT_STRING [optional]
+ "enabled" MPV_FORMAT_FLAG [optional]
"params" MPV_FORMAT_NODE_MAP [optional]
"key" MPV_FORMAT_STRING
"value" MPV_FORMAT_STRING
diff --git a/options/m_option.c b/options/m_option.c
index 29bbcb17db..796677696a 100644
--- a/options/m_option.c
+++ b/options/m_option.c
@@ -3121,6 +3121,7 @@ static int set_obj_settings_list(const m_option_t *opt, void *dst,
talloc_zero_array(NULL, m_obj_settings_t, src->u.list->num + 1);
for (int n = 0; n < src->u.list->num; n++) {
m_obj_settings_t *entry = &entries[n];
+ entry->enabled = true;
if (src->u.list->values[n].format != MPV_FORMAT_NODE_MAP)
goto error;
struct mpv_node_list *src_entry = src->u.list->values[n].u.list;