Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'

* commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf': avfiltergraph: replace AVFilterGraph.filter_count with nb_filters Conflicts: doc/APIchanges libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/graphparser.c libavfilter/version.h

Michael Niedermayer committed 13 years ago

Commit ecade982 parents 8a0187e 42c7c617 files · +42 −30Browse files

Showing the changes to libavfilter/avfiltergraph.h (1 of 7 files). Show all

Unified · Split

libavfilter/avfiltergraph.h+10−1

@@ -27,11 +27,20 @@ · 26 unmodified lines
27	27
28	28	typedef struct AVFilterGraph {
29	29	const AVClass *av_class;
30		− unsigned filter_count;
	30	+#if FF_API_FOO_COUNT
	31	+ attribute_deprecated
	32	+ unsigned filter_count_unused;
	33	+#endif
31	34	AVFilterContext **filters;
	35	+#if !FF_API_FOO_COUNT
	36	+ unsigned nb_filters;
	37	+#endif
32	38
33	39	char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters
34	40	char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters
	41	+#if FF_API_FOO_COUNT
	42	+ unsigned nb_filters;
	43	+#endif
35	44	char *aresample_swr_opts; ///< swr options to use for the auto-inserted aresample filters, Access ONLY through AVOptions
36	45
37	46	/**

Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code