Merge commit '111367263af41c88a44bd763ceefc11d53a7f655'

* commit '111367263af41c88a44bd763ceefc11d53a7f655':
  lavfi: add AVFilterContext.graph.

Conflicts:
	libavfilter/avfilter.h

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

2 files changed, 6 insertions, 0 deletions

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index e09fd75930..2360b24f7f 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -527,6 +527,8 @@ struct AVFilterContext {
 
     void *priv;                     ///< private data for use by the filter
 
+    struct AVFilterGraph *graph;    ///< filtergraph this filter belongs to
+
     struct AVFilterCommand *command_queue;
 };
 
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 4dca8643d9..8dd543362f 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -88,6 +88,8 @@ int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
     graph->filter_count_unused = graph->nb_filters;
 #endif
 
+    filter->graph = graph;
+
     return 0;
 }
 #endif
@@ -143,6 +145,8 @@ AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph,
     graph->filter_count_unused = graph->nb_filters;
 #endif
 
+    s->graph = graph;
+
     return s;
 }