Commit c74b0eda authored by Clément Bœsch's avatar Clément Bœsch

lavfi/amerge: switch to an AVOptions-based system.

parent eabc0c73
......@@ -759,7 +759,7 @@ aformat=sample_fmts=u8|s16:channel_layouts=stereo
Merge two or more audio streams into a single multi-channel stream.
The filter accepts the following named options:
The filter accepts the following options:
@table @option
......
......@@ -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);
......
......@@ -674,7 +674,6 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options,
static const char *const filters_left_to_update[] = {
"abuffer",
"aconvert",
"amerge",
"aresample",
"atempo",
"buffer",
......
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