Merge commit '111367263af41c88a44bd763ceefc11d53a7f655'

* commit '111367263af41c88a44bd763ceefc11d53a7f655': lavfi: add AVFilterContext.graph. Conflicts: libavfilter/avfilter.h

Michael Niedermayer committed 13 years ago

Commit 4fde7052 parents 5c68e14 11136723 files · +8 −0Browse files

Unified · Split

3 files

@@ -161,6 +161,8 @@ API changes, most recent first: · 160 unmodified lines
161	avfilterhraph.h, user applications should include just avfilter.h	161	avfilterhraph.h, user applications should include just avfilter.h
162	Add avfilter_graph_alloc_filter(), deprecate avfilter_open() and	162	Add avfilter_graph_alloc_filter(), deprecate avfilter_open() and
163	avfilter_graph_add_filter().	163	avfilter_graph_add_filter().
		164	Add AVFilterContext.graph pointing to the AVFilterGraph that contains the
		165	filter.
164		166
165	2013-xx-xx - lavfi 3.7.0 - avfilter.h	167	2013-xx-xx - lavfi 3.7.0 - avfilter.h
166	Add AVFilter.priv_class for exporting filter options through the AVOptions API	168	Add AVFilter.priv_class for exporting filter options through the AVOptions API

@@ -527,6 +527,8 @@ struct AVFilterContext { · 526 unmodified lines
527		527
528	void *priv; ///< private data for use by the filter	528	void *priv; ///< private data for use by the filter
529		529
		530	struct AVFilterGraph *graph; ///< filtergraph this filter belongs to
		531
530	struct AVFilterCommand *command_queue;	532	struct AVFilterCommand *command_queue;
531	};	533	};
532		534

     graph->filter_count_unused = graph->nb_filters;
 #endif
+    filter->graph = graph;
     return 0;
 }
 #endif
     graph->filter_count_unused = graph->nb_filters;
 #endif
+    s->graph = graph;
     return s;
 }

Keyboard shortcuts