diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-06-11 11:41:49 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-09-28 08:02:53 +0200 |
| commit | 57fa314090ab006808911fd790053b534749aa53 (patch) | |
| tree | 5f26b4a0857cd180163098e4d6aca9b83b1be7eb | |
| parent | 64abd375ec0219dca1bd918eca7793f71fcd9a3a (diff) | |
| download | ffmpeg-57fa314090ab006808911fd790053b534749aa53.tar.gz | |
lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()
Require "void *" rather than "AVClass *" for the log context type.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavfilter/avfilter.h | 2 | ||||
| -rw-r--r-- | libavfilter/avfiltergraph.c | 2 | ||||
| -rw-r--r-- | libavfilter/avfiltergraph.h | 4 | ||||
| -rw-r--r-- | libavfilter/graphparser.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index b9af1c4773..ee42585d6d 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 2 #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, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index af96807531..8c43251c4c 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -229,7 +229,7 @@ int ff_avfilter_graph_config_formats(AVFilterGraph *graph, AVClass *log_ctx) return 0; } -int avfilter_graph_config(AVFilterGraph *graphctx, AVClass *log_ctx) +int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx) { int ret; diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h index a0f6b2e01f..f9cf5cd3f9 100644 --- a/libavfilter/avfiltergraph.h +++ b/libavfilter/avfiltergraph.h @@ -76,7 +76,7 @@ int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt, * @param log_ctx context used for logging * @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. @@ -118,6 +118,6 @@ typedef struct AVFilterInOut { */ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, AVFilterInOut *inputs, AVFilterInOut *outputs, - AVClass *log_ctx); + void *log_ctx); #endif /* AVFILTER_AVFILTERGRAPH_H */ diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index abee4dffba..90f2936590 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -331,7 +331,7 @@ static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs, int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, AVFilterInOut *open_inputs, - AVFilterInOut *open_outputs, AVClass *log_ctx) + AVFilterInOut *open_outputs, void *log_ctx) { int index = 0, ret; char chr = 0; |