aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-03-17 20:16:12 +0100
committerAnton Khirnov <anton@khirnov.net>2013-04-11 20:40:20 +0200
commit1ba95a9cca57b023b9b9de071a5671fc05b05e58 (patch)
tree8b3ba983d5ac69eb207454487322c392b1056108 /libavfilter
parent48a5adab62bd2a553f5069d41fa632a0701835e5 (diff)
downloadffmpeg-1ba95a9cca57b023b9b9de071a5671fc05b05e58.tar.gz
lavfi: add avfilter_init_dict() for initializing a filter with a dict.
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/avfilter.c33
-rw-r--r--libavfilter/avfilter.h22
2 files changed, 43 insertions, 12 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index cbe3fdbd71..e127bd35d0 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -515,6 +515,26 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
}
#endif
+int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options)
+{
+ int ret = 0;
+
+ if (ctx->filter->priv_class) {
+ ret = av_opt_set_dict(ctx->priv, options);
+ if (ret < 0) {
+ av_log(ctx, AV_LOG_ERROR, "Error applying options to the filter.\n");
+ return ret;
+ }
+ }
+
+ if (ctx->filter->init)
+ ret = ctx->filter->init(ctx);
+ else if (ctx->filter->init_dict)
+ ret = ctx->filter->init_dict(ctx, options);
+
+ return ret;
+}
+
int avfilter_init_str(AVFilterContext *filter, const char *args)
{
AVDictionary *options = NULL;
@@ -616,18 +636,7 @@ int avfilter_init_str(AVFilterContext *filter, const char *args)
}
}
- if (filter->filter->priv_class) {
- ret = av_opt_set_dict(filter->priv, &options);
- if (ret < 0) {
- av_log(filter, AV_LOG_ERROR, "Error applying options to the filter.\n");
- goto fail;
- }
- }
-
- if (filter->filter->init)
- ret = filter->filter->init(filter);
- else if (filter->filter->init_dict)
- ret = filter->filter->init_dict(filter, &options);
+ ret = avfilter_init_dict(filter, &options);
if (ret < 0)
goto fail;
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index a01d7e631f..dffb2e56d9 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -674,6 +674,28 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
int avfilter_init_str(AVFilterContext *ctx, const char *args);
/**
+ * Initialize a filter with the supplied dictionary of options.
+ *
+ * @param ctx uninitialized filter context to initialize
+ * @param options An AVDictionary filled with options for this filter. On
+ * return this parameter will be destroyed and replaced with
+ * a dict containing options that were not found. This dictionary
+ * must be freed by the caller.
+ * May be NULL, then this function is equivalent to
+ * avfilter_init_str() with the second parameter set to NULL.
+ * @return 0 on success, a negative AVERROR on failure
+ *
+ * @note This function and avfilter_init_str() do essentially the same thing,
+ * the difference is in manner in which the options are passed. It is up to the
+ * calling code to choose whichever is more preferable. The two functions also
+ * behave differently when some of the provided options are not declared as
+ * supported by the filter. In such a case, avfilter_init_str() will fail, but
+ * this function will leave those extra options in the options AVDictionary and
+ * continue as usual.
+ */
+int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options);
+
+/**
* Free a filter context. This will also remove the filter from its
* filtergraph's list of filters.
*