Commit ac20e3ab authored by Anton Khirnov's avatar Anton Khirnov
Browse files

af_amix: switch to an AVOptions-based system.

parent 7536c671
...@@ -491,16 +491,7 @@ fail: ...@@ -491,16 +491,7 @@ fail:
static int init(AVFilterContext *ctx, const char *args) static int init(AVFilterContext *ctx, const char *args)
{ {
MixContext *s = ctx->priv; MixContext *s = ctx->priv;
int i, ret; int i;
s->class = &amix_class;
av_opt_set_defaults(s);
if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", args);
return ret;
}
av_opt_free(s);
for (i = 0; i < s->nb_inputs; i++) { for (i = 0; i < s->nb_inputs; i++) {
char name[32]; char name[32];
...@@ -563,6 +554,7 @@ AVFilter avfilter_af_amix = { ...@@ -563,6 +554,7 @@ AVFilter avfilter_af_amix = {
.name = "amix", .name = "amix",
.description = NULL_IF_CONFIG_SMALL("Audio mixing."), .description = NULL_IF_CONFIG_SMALL("Audio mixing."),
.priv_size = sizeof(MixContext), .priv_size = sizeof(MixContext),
.priv_class = &amix_class,
.init = init, .init = init,
.uninit = uninit, .uninit = uninit,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment