lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()

Require "void *" rather than "AVClass *" for the log context type.

Stefano Sabatini committed 15 years ago

Commit 57fa3141 parent 64abd374 files · +5 −5Browse files

Unified · Split

4 files

libavfilter/avfilter.h +1 −1
libavfilter/avfiltergraph.c +1 −1
libavfilter/avfiltergraph.h +2 −2
libavfilter/graphparser.c +1 −1

libavfilter/avfilter.h+1−1

@@ -30,7 +30,7 @@ · 29 unmodified lines
30		30
31	#define LIBAVFILTER_VERSION_MAJOR 2	31	#define LIBAVFILTER_VERSION_MAJOR 2
32	#define LIBAVFILTER_VERSION_MINOR 7	32	#define LIBAVFILTER_VERSION_MINOR 7
33	#define LIBAVFILTER_VERSION_MICRO 0	33	#define LIBAVFILTER_VERSION_MICRO 1
34		34
35	#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \	35	#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
36	LIBAVFILTER_VERSION_MINOR, \	36	LIBAVFILTER_VERSION_MINOR, \

libavfilter/avfiltergraph.c+1−1

@@ -229,7 +229,7 @@ int ff_avfilter_graph_config_formats(AVFilterGraph graph, AVClass log_ctx) · 228 unmodified lines
229	return 0;	229	return 0;
230	}	230	}
231		231
232	int avfilter_graph_config(AVFilterGraph graphctx, AVClass log_ctx)	232	int avfilter_graph_config(AVFilterGraph graphctx, void log_ctx)
233	{	233	{
234	int ret;	234	int ret;
235		235

libavfilter/avfiltergraph.h+2−2

@@ -76,7 +76,7 @@ int avfilter_graph_create_filter(AVFilterContext *filt_ctx, AVFilter filt, · 75 unmodified lines
76	* @param log_ctx context used for logging	76	* @param log_ctx context used for logging
77	* @return 0 in case of success, a negative AVERROR code otherwise	77	* @return 0 in case of success, a negative AVERROR code otherwise
78	*/	78	*/
79	int avfilter_graph_config(AVFilterGraph graphctx, AVClass log_ctx);	79	int avfilter_graph_config(AVFilterGraph graphctx, void log_ctx);
80		80
81	/**	81	/**
82	* Free a graph, destroy its links, and set *graph to NULL.	82	* Free a graph, destroy its links, and set *graph to NULL.
@@ -118,6 +118,6 @@ typedef struct AVFilterInOut { · 35 unmodified lines
118	*/	118	*/
119	int avfilter_graph_parse(AVFilterGraph graph, const char filters,	119	int avfilter_graph_parse(AVFilterGraph graph, const char filters,
120	AVFilterInOut inputs, AVFilterInOut outputs,	120	AVFilterInOut inputs, AVFilterInOut outputs,
121	AVClass *log_ctx);	121	void *log_ctx);
122		122
123	#endif /* AVFILTER_AVFILTERGRAPH_H */	123	#endif /* AVFILTER_AVFILTERGRAPH_H */

libavfilter/graphparser.c+1−1

@@ -331,7 +331,7 @@ static int parse_outputs(const char buf, AVFilterInOut curr_inputs, · 330 unmodified lines
331		331
332	int avfilter_graph_parse(AVFilterGraph graph, const char filters,	332	int avfilter_graph_parse(AVFilterGraph graph, const char filters,
333	AVFilterInOut *open_inputs,	333	AVFilterInOut *open_inputs,
334	AVFilterInOut open_outputs, AVClass log_ctx)	334	AVFilterInOut open_outputs, void log_ctx)
335	{	335	{
336	int index = 0, ret;	336	int index = 0, ret;
337	char chr = 0;	337	char chr = 0;