avfilter: remove opaque passing hacks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavfilter/avfilter.c

@@ -681,7 +681,6 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options,
     return count;
 }
 
-#if 0
 #if FF_API_AVFILTER_INIT_FILTER
 int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque)
 {
@@ -690,14 +689,6 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
 #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;
@@ -812,7 +803,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
     }
 
     if (filter->filter->init_opaque)
-        ret = filter->filter->init_opaque(filter, opaque);
+        ret = filter->filter->init_opaque(filter, NULL);
     else if (filter->filter->init)
         ret = filter->filter->init(filter);
     else if (filter->filter->init_dict)

libavfilter/avfiltergraph.c

@@ -119,7 +119,7 @@ int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt,
     if (!*filt_ctx)
         return AVERROR(ENOMEM);
 
-    ret = avfilter_init_filter(*filt_ctx, args, opaque);
+    ret = avfilter_init_str(*filt_ctx, args);
     if (ret < 0)
         goto fail;