From b2c84a91b69e58df10d6ea966078a03b096712bd Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 2 Sep 2016 16:10:55 +0200 Subject: options: deprecate --vo-defaults With the conversion from sub-options to global options, this becomes useless. This change also comes slightly too soon, because not all VOs have been changed yet. --- options/m_option.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'options/m_option.h') diff --git a/options/m_option.h b/options/m_option.h index d1426467e7..d344a79db2 100644 --- a/options/m_option.h +++ b/options/m_option.h @@ -608,10 +608,11 @@ extern const char m_option_path_separator; #define OPT_STRING(...) \ OPT_GENERAL(char*, __VA_ARGS__, .type = &m_option_type_string) -#define OPT_SETTINGSLIST(optname, varname, flags, objlist) \ +#define OPT_SETTINGSLIST(optname, varname, flags, objlist, ...) \ OPT_GENERAL(m_obj_settings_t*, optname, varname, flags, \ .type = &m_option_type_obj_settings_list, \ - .priv = (void*)MP_EXPECT_TYPE(const struct m_obj_list*, objlist)) + .priv = (void*)MP_EXPECT_TYPE(const struct m_obj_list*, objlist), \ + __VA_ARGS__) #define OPT_IMAGEFORMAT(...) \ OPT_GENERAL(int, __VA_ARGS__, .type = &m_option_type_imgfmt) -- cgit v1.2.3