From ac20e3ab8ed497549ee2a62754f01eee5e7a5066 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 25 Feb 2013 21:21:29 +0100
Subject: af_amix: switch to an AVOptions-based system.

---
 libavfilter/af_amix.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'libavfilter/af_amix.c')

diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c
index 5a4ec2e60e..9aa917eb90 100644
--- a/libavfilter/af_amix.c
+++ b/libavfilter/af_amix.c
@@ -491,16 +491,7 @@ fail:
 static int init(AVFilterContext *ctx, const char *args)
 {
     MixContext *s = ctx->priv;
-    int i, ret;
-
-    s->class = &amix_class;
-    av_opt_set_defaults(s);
-
-    if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
-        av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", args);
-        return ret;
-    }
-    av_opt_free(s);
+    int i;
 
     for (i = 0; i < s->nb_inputs; i++) {
         char name[32];
@@ -563,6 +554,7 @@ AVFilter avfilter_af_amix = {
     .name          = "amix",
     .description   = NULL_IF_CONFIG_SMALL("Audio mixing."),
     .priv_size     = sizeof(MixContext),
+    .priv_class    = &amix_class,
 
     .init           = init,
     .uninit         = uninit,
-- 
cgit v1.2.3