Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'

* commit 'dbb1425811a672eddf4acf0513237cdf20f83756': lavf: make sure stream probe data gets freed. avfiltergraph: set deprecated filter_count. Conflicts: libavformat/utils.c See: 44a7a6300d104dd453bcd5c601e9c6944fb34679

Michael Niedermayer committed 13 years ago

Commit ab298932 parents e7389ed dbb14252 files · +5 −1Browse files

Showing the changes to libavfilter/avfiltergraph.c (1 of 2 files). Show all

Unified · Split

libavfilter/avfiltergraph.c+4−0

@@ -84,6 +84,10 @@ int avfilter_graph_add_filter(AVFilterGraph graph, AVFilterContext filter) · 83 unmodified lines
84	84	graph->filters = filters;
85	85	graph->filters[graph->nb_filters++] = filter;
86	86
	87	+#if FF_API_FOO_COUNT
	88	+ graph->filter_count_unused = graph->nb_filters;
	89	+#endif
	90	+
87	91	return 0;
88	92	}
89	93

Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code