diff options
| -rw-r--r-- | doc/APIchanges | 8 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 2 | ||||
| -rw-r--r-- | libavfilter/avfiltergraph.c | 13 | ||||
| -rw-r--r-- | libavfilter/avfiltergraph.h | 27 | ||||
| -rw-r--r-- | libavfilter/internal.h | 23 |
5 files changed, 42 insertions, 31 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 1d86245580..730d5a6c9e 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,14 @@ libavutil: 2009-03-08 API changes, most recent first: +2010-11-13 - r25737 - lavfi 1.61.0 - avfiltergraph.h + Remove declarations from avfiltergraph.h for the functions: + avfilter_graph_check_validity() + avfilter_graph_config_links() + avfilter_graph_config_formats() + which are now internal. + Use avfilter_graph_config() instead. + 2010-11-08 - r25708 - lavu 50.33.0 - eval.h Deprecate functions: av_parse_and_eval_expr(), diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 5583a141b7..8ed2cef41d 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -25,7 +25,7 @@ #include "libavutil/avutil.h" #define LIBAVFILTER_VERSION_MAJOR 1 -#define LIBAVFILTER_VERSION_MINOR 60 +#define LIBAVFILTER_VERSION_MINOR 61 #define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 16c0355dd8..b138e693fe 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -25,6 +25,7 @@ #include "avfilter.h" #include "avfiltergraph.h" +#include "internal.h" AVFilterGraph *avfilter_graph_alloc(void) { @@ -52,7 +53,7 @@ int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter) return 0; } -int avfilter_graph_check_validity(AVFilterGraph *graph, AVClass *log_ctx) +int ff_avfilter_graph_check_validity(AVFilterGraph *graph, AVClass *log_ctx) { AVFilterContext *filt; int i, j; @@ -82,7 +83,7 @@ int avfilter_graph_check_validity(AVFilterGraph *graph, AVClass *log_ctx) return 0; } -int avfilter_graph_config_links(AVFilterGraph *graph, AVClass *log_ctx) +int ff_avfilter_graph_config_links(AVFilterGraph *graph, AVClass *log_ctx) { AVFilterContext *filt; int i, ret; @@ -194,7 +195,7 @@ static void pick_formats(AVFilterGraph *graph) } } -int avfilter_graph_config_formats(AVFilterGraph *graph, AVClass *log_ctx) +int ff_avfilter_graph_config_formats(AVFilterGraph *graph, AVClass *log_ctx) { /* find supported formats from sub-filters, and merge along links */ if(query_formats(graph, log_ctx)) @@ -211,11 +212,11 @@ int avfilter_graph_config(AVFilterGraph *graphctx, AVClass *log_ctx) { int ret; - if ((ret = avfilter_graph_check_validity(graphctx, log_ctx))) + if ((ret = ff_avfilter_graph_check_validity(graphctx, log_ctx))) return ret; - if ((ret = avfilter_graph_config_formats(graphctx, log_ctx))) + if ((ret = ff_avfilter_graph_config_formats(graphctx, log_ctx))) return ret; - if ((ret = avfilter_graph_config_links(graphctx, log_ctx))) + if ((ret = ff_avfilter_graph_config_links(graphctx, log_ctx))) return ret; return 0; diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h index 5bc8f0d4b8..ca369aa589 100644 --- a/libavfilter/avfiltergraph.h +++ b/libavfilter/avfiltergraph.h @@ -53,32 +53,11 @@ AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name); int avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter); /** - * Check for the validity of graph. - * - * A graph is considered valid if all its input and output pads are - * connected. - * - * @return 0 in case of success, a negative value otherwise - */ -int avfilter_graph_check_validity(AVFilterGraph *graphctx, AVClass *log_ctx); - -/** - * Configure all the links of graphctx. - * - * @return 0 in case of success, a negative value otherwise - */ -int avfilter_graph_config_links(AVFilterGraph *graphctx, AVClass *log_ctx); - -/** - * Configure the formats of all the links in the graph. - */ -int avfilter_graph_config_formats(AVFilterGraph *graphctx, AVClass *log_ctx); - -/** * Check validity and configure all the links and formats in the graph. * - * @see avfilter_graph_check_validity(), avfilter_graph_config_links(), - * avfilter_graph_config_formats() + * @param graphctx the filter graph + * @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); diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 2f0dde125d..37d085da52 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -25,6 +25,7 @@ */ #include "avfilter.h" +#include "avfiltergraph.h" void ff_dprintf_ref(void *ctx, AVFilterBufferRef *ref, int end); @@ -34,4 +35,26 @@ void ff_dprintf_link(void *ctx, AVFilterLink *link, int end); #define FF_DPRINTF_START(ctx, func) dprintf(NULL, "%-16s: ", #func) +/** + * Check for the validity of graph. + * + * A graph is considered valid if all its input and output pads are + * connected. + * + * @return 0 in case of success, a negative value otherwise + */ +int ff_avfilter_graph_check_validity(AVFilterGraph *graphctx, AVClass *log_ctx); + +/** + * Configure all the links of graphctx. + * + * @return 0 in case of success, a negative value otherwise + */ +int ff_avfilter_graph_config_links(AVFilterGraph *graphctx, AVClass *log_ctx); + +/** + * Configure the formats of all the links in the graph. + */ +int ff_avfilter_graph_config_formats(AVFilterGraph *graphctx, AVClass *log_ctx); + #endif /* AVFILTER_INTERNAL_H */ |