diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-02-25 21:21:29 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-04-09 19:09:26 +0200 |
| commit | ac20e3ab8ed497549ee2a62754f01eee5e7a5066 (patch) | |
| tree | ad0fa7bed9ee8b96ac19102b5924b218ab852e25 | |
| parent | 7536c671040f1f3ebc9f0d3b7831dac71436b775 (diff) | |
| download | ffmpeg-ac20e3ab8ed497549ee2a62754f01eee5e7a5066.tar.gz | |
af_amix: switch to an AVOptions-based system.
| -rw-r--r-- | libavfilter/af_amix.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index 5a4ec2e60e..9aa917eb90 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -491,16 +491,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) { - av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", args); - return ret; - } - av_opt_free(s); + int i; for (i = 0; i < s->nb_inputs; i++) { char name[32]; @@ -563,6 +554,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, |