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

---
 libavfilter/avfilter.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'libavfilter/avfilter.c')

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 93d1855ce3..a8429aac3e 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -501,11 +501,12 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
         }
     }
 
-    if (filter->filter->init) {
+    if (filter->filter->init)
         ret = filter->filter->init(filter, args);
-        if (ret < 0)
-            goto fail;
-    }
+    else if (filter->filter->init_dict)
+        ret = filter->filter->init_dict(filter, &options);
+    if (ret < 0)
+        goto fail;
 
     if ((e = av_dict_get(options, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
         av_log(filter, AV_LOG_ERROR, "No such option: %s.\n", e->key);
-- 
cgit v1.2.3