diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 01:01:48 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 01:31:55 +0200 |
commit | 710b0aa8012a25b646d6c0f0853fddcd79fc5e1b (patch) | |
tree | 0a87978efc6a0f60ef99d7a24a833c91a4a2c837 /libavfilter/avfilter.h | |
parent | eb0f774d4bfdb1e5cb131f63580417cfb6b47514 (diff) | |
parent | 48a5adab62bd2a553f5069d41fa632a0701835e5 (diff) |
Merge commit '48a5adab62bd2a553f5069d41fa632a0701835e5'
* commit '48a5adab62bd2a553f5069d41fa632a0701835e5':
lavfi: add avfilter_init_str() to replace avfilter_init_filter().
avfilter_graph_create_filter() opaque is still passed to avfilter_init_filter()
which continues to pass it to init_opaque as its still used in the buffer sinks
the sinks should be changed and the opaque passing removed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.h')
-rw-r--r-- | libavfilter/avfilter.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 711cf4b551..88cd3e3979 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -860,6 +860,8 @@ attribute_deprecated int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name); #endif + +#if FF_API_AVFILTER_INIT_FILTER /** * Initialize a filter. * @@ -870,7 +872,21 @@ int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *in * of this parameter varies by filter. * @return zero on success */ +attribute_deprecated int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque); +#endif + +/** + * Initialize a filter with the supplied parameters. + * + * @param ctx uninitialized filter context to initialize + * @param args Options to initialize the filter with. This must be a + * ':'-separated list of options in the 'key=value' form. + * May be NULL if the options have been set directly using the + * AVOptions API or there are no options that need to be set. + * @return 0 on success, a negative AVERROR on failure + */ +int avfilter_init_str(AVFilterContext *ctx, const char *args); /** * Free a filter context. This will also remove the filter from its |