From c74b0eda34f187cc879361f93bd1d8cd7a1c54e6 Mon Sep 17 00:00:00 2001 From: Clément Bœsch Date: Thu, 11 Apr 2013 18:28:13 +0200 Subject: lavfi/amerge: switch to an AVOptions-based system. --- doc/filters.texi | 2 +- libavfilter/af_amerge.c | 9 +-------- libavfilter/avfilter.c | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index d6b9ca1112..097d3bce4c 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -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 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); diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 334598ddc7..64d9e933ea 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -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", -- cgit v1.2.3