diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index dcb24b0f3a..a1f6747c51 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -486,14 +486,7 @@ fail: static int init(AVFilterContext *ctx, const char *args) { MixContext *s = ctx->priv; - int i, ret; - - s->class = &amix_class; - av_opt_set_defaults(s); - - if ((ret = av_set_options_string(s, args, "=", ":")) < 0) - return ret; - av_opt_free(s); + int i; for (i = 0; i < s->nb_inputs; i++) { char name[32]; @@ -556,6 +549,7 @@ AVFilter avfilter_af_amix = { .name = "amix", .description = NULL_IF_CONFIG_SMALL("Audio mixing."), .priv_size = sizeof(MixContext), + .priv_class = &amix_class, .init = init, .uninit = uninit, @@ -563,5 +557,4 @@ AVFilter avfilter_af_amix = { .inputs = NULL, .outputs = avfilter_af_amix_outputs, - .priv_class = &amix_class, }; diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 8fe2389c80..497a867801 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -657,6 +657,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque int ret=0; int anton_options = !strcmp(filter->filter->name, "aformat") || + !strcmp(filter->filter->name, "amix" ) || !strcmp(filter->filter->name, "ass") || !strcmp(filter->filter->name, "blackframe") || !strcmp(filter->filter->name, "boxblur" ) ||