From 8eb9bf093381efdeeaaab4ebe73ca3c255325961 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 16 May 2012 07:59:52 +0200 Subject: avfiltergraph: make some functions static. They are not used outside of avfiltergraph.c --- libavfilter/avfiltergraph.c | 28 ++++++++++++++++++++++------ libavfilter/internal.h | 23 ----------------------- 2 files changed, 22 insertions(+), 29 deletions(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index b2db5dcf97..bc275142d2 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -93,7 +93,15 @@ fail: return ret; } -int ff_avfilter_graph_check_validity(AVFilterGraph *graph, AVClass *log_ctx) +/** + * 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 + */ +static int graph_check_validity(AVFilterGraph *graph, AVClass *log_ctx) { AVFilterContext *filt; int i, j; @@ -123,7 +131,12 @@ int ff_avfilter_graph_check_validity(AVFilterGraph *graph, AVClass *log_ctx) return 0; } -int ff_avfilter_graph_config_links(AVFilterGraph *graph, AVClass *log_ctx) +/** + * Configure all the links of graphctx. + * + * @return 0 in case of success, a negative value otherwise + */ +static int graph_config_links(AVFilterGraph *graph, AVClass *log_ctx) { AVFilterContext *filt; int i, ret; @@ -546,7 +559,10 @@ static int pick_formats(AVFilterGraph *graph) return 0; } -int ff_avfilter_graph_config_formats(AVFilterGraph *graph, AVClass *log_ctx) +/** + * Configure the formats of all the links in the graph. + */ +static int graph_config_formats(AVFilterGraph *graph, AVClass *log_ctx) { int ret; @@ -575,11 +591,11 @@ int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx) { int ret; - if ((ret = ff_avfilter_graph_check_validity(graphctx, log_ctx))) + if ((ret = graph_check_validity(graphctx, log_ctx))) return ret; - if ((ret = ff_avfilter_graph_config_formats(graphctx, log_ctx))) + if ((ret = graph_config_formats(graphctx, log_ctx))) return ret; - if ((ret = ff_avfilter_graph_config_links(graphctx, log_ctx))) + if ((ret = graph_config_links(graphctx, log_ctx))) return ret; return 0; diff --git a/libavfilter/internal.h b/libavfilter/internal.h index a5b3f788da..4eb65305f9 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -25,29 +25,6 @@ */ #include "avfilter.h" -#include "avfiltergraph.h" - -/** - * 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); /** default handler for freeing audio/video buffer when there are no references left */ void ff_avfilter_default_free_buffer(AVFilterBuffer *buf); -- cgit v1.2.3