[FFmpeg-cvslog] r12692 - in trunk/libavfilter: avfiltergraph.c avfiltergraph.h

[vitor]

Author: vitor
Date: Fri Apr  4 22:06:13 2008
New Revision: 12692

Log:
Allow code to pass data to filters it creates.

Commited in SoC by Bobby Bingham on 2007-07-15 16:45:50


Modified:
   trunk/libavfilter/avfiltergraph.c
   trunk/libavfilter/avfiltergraph.h

Modified: trunk/libavfilter/avfiltergraph.c
==============================================================================
--- trunk/libavfilter/avfiltergraph.c	(original)
+++ trunk/libavfilter/avfiltergraph.c	Fri Apr  4 22:06:13 2008
@@ -56,7 +56,7 @@ void avfilter_graph_add_filter(AVFilterG
     graph->filters[graph->filter_count - 1] = filter;
 }
 
-static AVFilterContext *create_filter_with_args(const char *filt)
+static AVFilterContext *create_filter_with_args(const char *filt, void *opaque)
 {
     AVFilterContext *ret;
     char *filter = av_strdup(filt); /* copy - don't mangle the input string */
@@ -75,7 +75,7 @@ static AVFilterContext *create_filter_wi
            name, args ? args : "(none)");
 
     if((ret = avfilter_create_by_name(name, NULL))) {
-        if(avfilter_init_filter(ret, args)) {
+        if(avfilter_init_filter(ret, args, opaque)) {
             av_log(NULL, AV_LOG_ERROR, "error initializing filter!\n");
             avfilter_destroy(ret);
             goto fail;
@@ -90,14 +90,19 @@ fail:
 }
 
 int avfilter_graph_load_chain(AVFilterGraph *graph,
-                              unsigned count, char **filter_list,
+                              unsigned count, char **filter_list, void **opaque,
                               AVFilterContext **first, AVFilterContext **last)
 {
     unsigned i;
     AVFilterContext *filters[2] = {NULL,NULL};
 
     for(i = 0; i < count; i ++) {
-        if(!(filters[1] = create_filter_with_args(filter_list[i])))
+        void *op;
+
+        if(opaque) op = opaque[i];
+        else       op = NULL;
+
+        if(!(filters[1] = create_filter_with_args(filter_list[i], op)))
             goto fail;
         if(i == 0) {
             if(first) *first = filters[1];

Modified: trunk/libavfilter/avfiltergraph.h
==============================================================================
--- trunk/libavfilter/avfiltergraph.h	(original)
+++ trunk/libavfilter/avfiltergraph.h	Fri Apr  4 22:06:13 2008
@@ -55,6 +55,6 @@ void avfilter_graph_add_filter(AVFilterG
  * @return 0 on success.  -1 on error.
  */
 int avfilter_graph_load_chain(AVFilterGraph *graph,
-                              unsigned count, char **filter_list,
+                              unsigned count, char **filter_list, void **opaque,
                               AVFilterContext **first, AVFilterContext **last);
 #endif  /* FFMPEG_AVFILTER_H */