Browse Source

avfiltergraph: make some functions static.

They are not used outside of avfiltergraph.c
tags/n1.0
Anton Khirnov 13 years ago
parent
commit
8eb9bf0933
2 changed files with 22 additions and 29 deletions
  1. +22
    -6
      libavfilter/avfiltergraph.c
  2. +0
    -23
      libavfilter/internal.h

+ 22
- 6
libavfilter/avfiltergraph.c View File

@@ -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;


+ 0
- 23
libavfilter/internal.h View File

@@ -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);


Loading…
Cancel
Save