Commit 9f39bb37 authored by Vitor Sessak's avatar Vitor Sessak
Browse files

Rename variable GraphContext -> AVFilterGraph

Commited in SoC by Vitor Sessak on 2008-03-26 20:31:53

Originally committed as revision 12736 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 5c2ff9fd
......@@ -41,7 +41,7 @@ static const AVClass filter_parser_class = {
static const AVClass *log_ctx = &filter_parser_class;
static void uninit(GraphContext *graph)
static void uninit(AVFilterGraph *graph)
{
for(; graph->filter_count > 0; graph->filter_count --)
avfilter_destroy(graph->filters[graph->filter_count - 1]);
......@@ -49,7 +49,7 @@ static void uninit(GraphContext *graph)
}
/* TODO: insert in sorted order */
void avfilter_graph_add_filter(GraphContext *graph, AVFilterContext *filter)
void avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
{
graph->filters = av_realloc(graph->filters,
sizeof(AVFilterContext*) * ++graph->filter_count);
......@@ -57,7 +57,7 @@ void avfilter_graph_add_filter(GraphContext *graph, AVFilterContext *filter)
}
/* search intelligently, once we insert in order */
AVFilterContext *avfilter_graph_get_filter(GraphContext *graph, char *name)
AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name)
{
int i;
......@@ -71,7 +71,7 @@ AVFilterContext *avfilter_graph_get_filter(GraphContext *graph, char *name)
return NULL;
}
static int query_formats(GraphContext *graph)
static int query_formats(AVFilterGraph *graph)
{
int i, j;
......@@ -133,7 +133,7 @@ static void pick_format(AVFilterLink *link)
avfilter_formats_unref(&link->out_formats);
}
static void pick_formats(GraphContext *graph)
static void pick_formats(AVFilterGraph *graph)
{
int i, j;
......@@ -147,7 +147,7 @@ static void pick_formats(GraphContext *graph)
}
}
int avfilter_graph_config_formats(GraphContext *graph)
int avfilter_graph_config_formats(AVFilterGraph *graph)
{
/* find supported formats from sub-filters, and merge along links */
if(query_formats(graph))
......@@ -160,7 +160,7 @@ int avfilter_graph_config_formats(GraphContext *graph)
return 0;
}
static int graph_load_from_desc2(GraphContext *ctx, AVFilterGraphDesc *desc)
static int graph_load_from_desc2(AVFilterGraph *ctx, AVFilterGraphDesc *desc)
{
AVFilterGraphDescFilter *curfilt;
AVFilterGraphDescLink *curlink;
......@@ -211,7 +211,7 @@ fail:
return -1;
}
int graph_load_from_desc3(GraphContext *graph, AVFilterGraphDesc *desc, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad)
int graph_load_from_desc3(AVFilterGraph *graph, AVFilterGraphDesc *desc, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad)
{
AVFilterGraphDescExport *curpad;
char tmp[20];
......
......@@ -69,7 +69,7 @@ typedef struct
typedef struct AVFilterGraph {
unsigned filter_count;
AVFilterContext **filters;
} GraphContext;
} AVFilterGraph;
/**
* Parse a graph composed of a simple chain of filters which is described by
......@@ -90,20 +90,20 @@ void avfilter_graph_free_desc(AVFilterGraphDesc *desc);
* @param graph The filter graph
* @param filter The filter to be added
*/
void avfilter_graph_add_filter(GraphContext *graphctx, AVFilterContext *filter);
void avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter);
/**
* Configure the formats of all the links in the graph.
*/
int avfilter_graph_config_formats(GraphContext *graphctx);
int avfilter_graph_config_formats(AVFilterGraph *graphctx);
/**
* Configure the parameters (resolution, etc) of all links in the graph.
*/
int avfilter_graph_config_links(GraphContext *graphctx);
int avfilter_graph_config_links(AVFilterGraph *graphctx);
int graph_load_from_desc3(GraphContext *ctx, AVFilterGraphDesc *desc,
int graph_load_from_desc3(AVFilterGraph *ctx, AVFilterGraphDesc *desc,
AVFilterContext *in, int inpad,
AVFilterContext *out, int outpad);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment