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>

1 files changed, 15 insertions, 0 deletions

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 54d90dcd02..3c19744a8b 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -701,8 +701,23 @@ static int filter_use_deprecated_init(const char *name)
             return 1;
     return 0;
 }
+#if 0
+#if FF_API_AVFILTER_INIT_FILTER
+int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque)
+{
+    return avfilter_init_str(filter, args);
+}
+#endif
+
+int avfilter_init_str(AVFilterContext *filter, const char *args)
+#else
+int avfilter_init_str(AVFilterContext *filter, const char *args)
+{
+    return avfilter_init_filter(filter, args, NULL);
+}
 
 int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque)
+#endif
 {
     AVDictionary *options = NULL;
     AVDictionaryEntry *e;