Commit 5cb9c725 authored by Vitor Sessak's avatar Vitor Sessak
Browse files

Simplify

Commited in SoC by Vitor Sessak on 2008-04-18 17:57:42

Originally committed as revision 13318 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 3a70bb2d
......@@ -225,22 +225,20 @@ static int handle_link(char *name, AVFilterInOut **inout, int pad,
if(p->type == LinkTypeIn && type == LinkTypeOut) {
if(link_filter(filter, pad, p->filter, p->pad_idx, log_ctx) < 0)
goto fail;
return -1;
} else if(p->type == LinkTypeOut && type == LinkTypeIn) {
if(link_filter(p->filter, p->pad_idx, filter, pad, log_ctx) < 0)
goto fail;
return -1;
} else {
av_log(log_ctx, AV_LOG_ERROR,
"Two links named '%s' are either both input or both output\n",
name);
goto fail;
return -1;
}
p->filter = NULL;
return 0;
fail:
return -1;
}
......
......@@ -35,6 +35,9 @@
* @param outpad pad index of the output
* @return zero on success, -1 on error
*/
int avfilter_parse_graph(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad);
int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
AVFilterContext *in, int inpad,
AVFilterContext *out, int outpad,
AVClass *log_ctx);
#endif /* FFMPEG_GRAPHPARSER_H */
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