Require "void *" rather than "AVClass *" for the log context type. Signed-off-by: Anton Khirnov <anton@khirnov.net>tags/n0.9
| @@ -30,7 +30,7 @@ | |||||
| #define LIBAVFILTER_VERSION_MAJOR 2 | #define LIBAVFILTER_VERSION_MAJOR 2 | ||||
| #define LIBAVFILTER_VERSION_MINOR 7 | #define LIBAVFILTER_VERSION_MINOR 7 | ||||
| #define LIBAVFILTER_VERSION_MICRO 0 | |||||
| #define LIBAVFILTER_VERSION_MICRO 1 | |||||
| #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ | ||||
| LIBAVFILTER_VERSION_MINOR, \ | LIBAVFILTER_VERSION_MINOR, \ | ||||
| @@ -229,7 +229,7 @@ int ff_avfilter_graph_config_formats(AVFilterGraph *graph, AVClass *log_ctx) | |||||
| return 0; | return 0; | ||||
| } | } | ||||
| int avfilter_graph_config(AVFilterGraph *graphctx, AVClass *log_ctx) | |||||
| int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx) | |||||
| { | { | ||||
| int ret; | int ret; | ||||
| @@ -76,7 +76,7 @@ int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt, | |||||
| * @param log_ctx context used for logging | * @param log_ctx context used for logging | ||||
| * @return 0 in case of success, a negative AVERROR code otherwise | * @return 0 in case of success, a negative AVERROR code otherwise | ||||
| */ | */ | ||||
| int avfilter_graph_config(AVFilterGraph *graphctx, AVClass *log_ctx); | |||||
| int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx); | |||||
| /** | /** | ||||
| * Free a graph, destroy its links, and set *graph to NULL. | * Free a graph, destroy its links, and set *graph to NULL. | ||||
| @@ -118,6 +118,6 @@ typedef struct AVFilterInOut { | |||||
| */ | */ | ||||
| int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, | int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, | ||||
| AVFilterInOut *inputs, AVFilterInOut *outputs, | AVFilterInOut *inputs, AVFilterInOut *outputs, | ||||
| AVClass *log_ctx); | |||||
| void *log_ctx); | |||||
| #endif /* AVFILTER_AVFILTERGRAPH_H */ | #endif /* AVFILTER_AVFILTERGRAPH_H */ | ||||
| @@ -331,7 +331,7 @@ static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs, | |||||
| int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, | int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, | ||||
| AVFilterInOut *open_inputs, | AVFilterInOut *open_inputs, | ||||
| AVFilterInOut *open_outputs, AVClass *log_ctx) | |||||
| AVFilterInOut *open_outputs, void *log_ctx) | |||||
| { | { | ||||
| int index = 0, ret; | int index = 0, ret; | ||||
| char chr = 0; | char chr = 0; | ||||