summaryrefslogtreecommitdiff
path: root/libavfilter/graphparser.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavfilter/graphparser.c')
-rw-r--r--libavfilter/graphparser.c37
1 files changed, 3 insertions, 34 deletions
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index 436d287b8d..69ec8ec6a5 100644
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -23,6 +23,7 @@
#include <ctype.h>
#include <string.h>
+#include "graphparser.h"
#include "avfilter.h"
#include "avfiltergraph.h"
@@ -149,24 +150,6 @@ static void parse_link_name(const char **buf, char **name, AVClass *log_ctx)
}
}
-
-enum LinkType {
- LinkTypeIn,
- LinkTypeOut,
-};
-
-/**
- * A linked-list of the inputs/outputs of the filter chain.
- */
-typedef struct AVFilterInOut {
- enum LinkType type;
- const char *name;
- AVFilterContext *filter;
- int pad_idx;
-
- struct AVFilterInOut *next;
-} AVFilterInOut;
-
static void free_inout(AVFilterInOut *head)
{
while(head) {
@@ -363,28 +346,14 @@ static int parse_outputs(const char **buf, AVFilterInOut **currInputs,
* Parse a string describing a filter graph.
*/
int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
- AVFilterContext *in, int inpad,
- AVFilterContext *out, int outpad,
- AVClass *log_ctx)
+ AVFilterInOut *inouts, AVClass *log_ctx)
{
int index = 0;
char chr = 0;
int pad = 0;
AVFilterInOut *currInputs = NULL;
- AVFilterInOut *openLinks = av_malloc(sizeof(AVFilterInOut));
-
- openLinks->name = "in";
- openLinks->filter = in;
- openLinks->type = LinkTypeOut;
- openLinks->pad_idx = inpad;
- openLinks->next = av_malloc(sizeof(AVFilterInOut));
-
- openLinks->next->name = "out";
- openLinks->next->filter = out;
- openLinks->next->type = LinkTypeIn;
- openLinks->next->pad_idx = outpad;
- openLinks->next->next = NULL;
+ AVFilterInOut *openLinks = inouts;
do {
AVFilterContext *filter;