History

Merge commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58'

* commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58': lavfi: add avfilter_init_dict() for initializing a filter with a dict. Conflicts: libavfilter/avfilter.c

Michael Niedermayer committed 13 years ago

Commit 46de9ba2 parents 6b5ec76 1ba95a93 files · +46 −14Browse files

Showing the changes to libavfilter/avfilter.h (1 of 3 files). Show all

Unified · Split

libavfilter/avfilter.h+22−0
@@ -888,6 +888,28 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 887 unmodified lines
888888 */
889889 int avfilter_init_str(AVFilterContext *ctx, const char *args);
890890
891+/**
892+ * Initialize a filter with the supplied dictionary of options.
893+ *
894+ * @param ctx uninitialized filter context to initialize
895+ * @param options An AVDictionary filled with options for this filter. On
896+ * return this parameter will be destroyed and replaced with
897+ * a dict containing options that were not found. This dictionary
898+ * must be freed by the caller.
899+ * May be NULL, then this function is equivalent to
900+ * avfilter_init_str() with the second parameter set to NULL.
901+ * @return 0 on success, a negative AVERROR on failure
902+ *
903+ * @note This function and avfilter_init_str() do essentially the same thing,
904+ * the difference is in manner in which the options are passed. It is up to the
905+ * calling code to choose whichever is more preferable. The two functions also
906+ * behave differently when some of the provided options are not declared as
907+ * supported by the filter. In such a case, avfilter_init_str() will fail, but
908+ * this function will leave those extra options in the options AVDictionary and
909+ * continue as usual.
910+ */
911+int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options);
912+
891913 /**
892914 * Free a filter context. This will also remove the filter from its
893915 * filtergraph's list of filters.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t