diff options
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/af_amerge.c | 9 | ||||
-rw-r--r-- | libavfilter/avfilter.c | 1 |
2 files changed, 1 insertions, 9 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); 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", |