diff options
Diffstat (limited to 'filters/user_filters.c')
-rw-r--r-- | filters/user_filters.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/filters/user_filters.c b/filters/user_filters.c index e9ccec507d..b5f29adf18 100644 --- a/filters/user_filters.c +++ b/filters/user_filters.c @@ -4,7 +4,7 @@ #include "common/common.h" #include "common/msg.h" -#include "options/m_config.h" +#include "options/m_config_frontend.h" #include "f_lavfi.h" #include "user_filters.h" @@ -34,11 +34,13 @@ const struct mp_user_filter_entry *af_list[] = { &af_lavfi, &af_lavfi_bridge, &af_scaletempo, + &af_scaletempo2, &af_format, #if HAVE_RUBBERBAND &af_rubberband, #endif &af_lavcac3enc, + &af_drop, }; static bool get_af_desc(struct m_obj_desc *dst, int index) @@ -65,7 +67,6 @@ const struct m_obj_list af_obj_list = { .get_desc = get_af_desc, .description = "audio filters", .allow_disable_entries = true, - .allow_unknown_entries = true, .check_unknown_entry = check_af_lavfi, .print_help_list = print_af_help_list, .print_unknown_entry_help = print_af_lavfi_help, @@ -93,7 +94,7 @@ const struct mp_user_filter_entry *vf_list[] = { #if HAVE_D3D_HWACCEL &vf_d3d11vpp, #endif -#if HAVE_EGL_HELPERS && HAVE_GL && HAVE_EGL +#if HAVE_GL && HAVE_EGL &vf_gpu, #endif }; @@ -122,7 +123,6 @@ const struct m_obj_list vf_obj_list = { .get_desc = get_vf_desc, .description = "video filters", .allow_disable_entries = true, - .allow_unknown_entries = true, .check_unknown_entry = check_vf_lavfi, .print_help_list = print_vf_help_list, .print_unknown_entry_help = print_vf_lavfi_help, @@ -134,16 +134,13 @@ struct mp_filter *mp_create_user_filter(struct mp_filter *parent, const char *name, char **args) { const struct m_obj_list *obj_list = NULL; - const char *defs_name = NULL; enum mp_frame_type frame_type = 0; if (type == MP_OUTPUT_CHAIN_VIDEO) { frame_type = MP_FRAME_VIDEO; obj_list = &vf_obj_list; - defs_name = "vf-defaults"; } else if (type == MP_OUTPUT_CHAIN_AUDIO) { frame_type = MP_FRAME_AUDIO; obj_list = &af_obj_list; - defs_name = "af-defaults"; } assert(frame_type && obj_list); @@ -155,7 +152,7 @@ struct mp_filter *mp_create_user_filter(struct mp_filter *parent, if (strncmp(name, "lavfi-", 6) == 0) name += 6; struct mp_lavfi *l = - mp_lavfi_create_filter(parent, frame_type, true, NULL, name, args); + mp_lavfi_create_filter(parent, frame_type, true, NULL, NULL, name, args); if (l) f = l->f; goto done; @@ -163,18 +160,9 @@ struct mp_filter *mp_create_user_filter(struct mp_filter *parent, void *options = NULL; if (desc.options) { - struct m_obj_settings *defs = NULL; - if (defs_name) { - mp_read_option_raw(parent->global, defs_name, - &m_option_type_obj_settings_list, &defs); - } - struct m_config *config = m_config_from_obj_desc_and_args(NULL, parent->log, parent->global, - &desc, name, defs, args); - - struct m_option dummy = {.type = &m_option_type_obj_settings_list}; - m_option_free(&dummy, &defs); + &desc, args); if (!config) goto done; |