diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index ddf13c3badd478320ceefc8c3dee00d8aec71d73..8f12d7d1d5f0516350c996b910d8b65abd62e5b6 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -25,8 +25,8 @@ #include "libavutil/avutil.h" #define LIBAVFILTER_VERSION_MAJOR 1 -#define LIBAVFILTER_VERSION_MINOR 14 -#define LIBAVFILTER_VERSION_MICRO 1 +#define LIBAVFILTER_VERSION_MINOR 15 +#define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 269d566d5f50121934ec06b089412951e1b35fcf..73e5f1476fa2641af6f552969e3f6c32c52dd31d 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -105,7 +105,7 @@ AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name) return NULL; } -static int query_formats(AVFilterGraph *graph) +static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) { int i, j; int scaler_count = 0; @@ -186,10 +186,10 @@ static void pick_formats(AVFilterGraph *graph) } } -int avfilter_graph_config_formats(AVFilterGraph *graph) +int avfilter_graph_config_formats(AVFilterGraph *graph, AVClass *log_ctx) { /* find supported formats from sub-filters, and merge along links */ - if(query_formats(graph)) + if(query_formats(graph, log_ctx)) return -1; /* Once everything is merged, it's possible that we'll still have diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h index c78d53f0a3a3e6e0f152c72706f6173e96f61b6d..df71ef85431aaa1dff0377aaa5b39f09bd207af6 100644 --- a/libavfilter/avfiltergraph.h +++ b/libavfilter/avfiltergraph.h @@ -66,7 +66,7 @@ int avfilter_graph_config_links(AVFilterGraph *graphctx, AVClass *log_ctx); /** * Configures the formats of all the links in the graph. */ -int avfilter_graph_config_formats(AVFilterGraph *graphctx); +int avfilter_graph_config_formats(AVFilterGraph *graphctx, AVClass *log_ctx); /** * Frees a graph and destroys its links.