summaryrefslogtreecommitdiff
path: root/libavfilter/af_amerge.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2013-04-11 18:28:13 +0200
committerClément Bœsch <ubitux@gmail.com>2013-04-11 18:31:01 +0200
commitc74b0eda34f187cc879361f93bd1d8cd7a1c54e6 (patch)
tree64ee0e15ab96343d20299666ee8f40e6512a992c /libavfilter/af_amerge.c
parenteabc0c733dee807d721d4c8a7acb7dd05684ef89 (diff)
lavfi/amerge: switch to an AVOptions-based system.
Diffstat (limited to 'libavfilter/af_amerge.c')
-rw-r--r--libavfilter/af_amerge.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 4a7b0b724c..1d3792d7a8 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -306,15 +306,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
static av_cold int init(AVFilterContext *ctx, const char *args)
{
AMergeContext *am = ctx->priv;
- int ret, i;
+ int i;
- am->class = &amerge_class;
- av_opt_set_defaults(am);
- ret = av_set_options_string(am, args, "=", ":");
- if (ret < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options: '%s'\n", args);
- return ret;
- }
am->in = av_calloc(am->nb_inputs, sizeof(*am->in));
if (!am->in)
return AVERROR(ENOMEM);