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	161	avfilterhraph.h, user applications should include just avfilter.h
162	162	Add avfilter_graph_alloc_filter(), deprecate avfilter_open() and
163	163	avfilter_graph_add_filter().
	164	+ Add AVFilterContext.graph pointing to the AVFilterGraph that contains the
	165	+ filter.
164	166
165	167	2013-xx-xx - lavfi 3.7.0 - avfilter.h
166	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	528	void *priv; ///< private data for use by the filter
529	529
	530	+ struct AVFilterGraph *graph; ///< filtergraph this filter belongs to
	531	+
530	532	struct AVFilterCommand *command_queue;
531	533	};
532	534

@@ -88,6 +88,8 @@ int avfilter_graph_add_filter(AVFilterGraph graph, AVFilterContext filter) · 87 unmodified lines
88	88	graph->filter_count_unused = graph->nb_filters;
89	89	#endif
90	90
	91	+ filter->graph = graph;
	92	+
91	93	return 0;
92	94	}
93	95	#endif
@@ -143,6 +145,8 @@ AVFilterContext avfilter_graph_alloc_filter(AVFilterGraph graph, · 49 unmodified lines
143	145	graph->filter_count_unused = graph->nb_filters;
144	146	#endif
145	147
	148	+ s->graph = graph;
	149	+
146	150	return s;
147	151	}
148	152

Keyboard shortcuts