diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-02-25 21:21:29 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-04-09 18:45:50 +0200 |
| commit | 4fa1f52e33b70029e2b621852f3af7c1ef9aecff (patch) | |
| tree | b10b0e58b3d71ab977510bd477beaf9f3fb61e52 /libavfilter/avfilter.c | |
| parent | b439c992c23f3e0f3832fffd2a34a664b236c525 (diff) | |
af_resample: switch to an AVOptions-based system.
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 9 |
1 files changed, 5 insertions, 4 deletions
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); |