[FFmpeg-cvslog] lavfi/amerge: switch to an AVOptions-based system.

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Thu Apr 11 18:28:13 2013 +0200| [c74b0eda34f187cc879361f93bd1d8cd7a1c54e6] | committer: Clément Bœsch

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c74b0eda34f187cc879361f93bd1d8cd7a1c54e6
---

 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 d6b9ca1..097d3bc 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 4a7b0b7..1d3792d 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 334598d..64d9e93 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",