Download-Tools/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-12 13:06:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify

Browse Source 
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
This commit is contained in:
Vitor Sessak 2008-05-24 20:40:26 +00:00
parent 3a70bb2d76
commit 5cb9c725f2
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/graphparser.c
View File

@ -225,22 +225,20 @@ static int handle_link(char *name, AVFilterInOut **inout, int pad,
if(p->type == LinkTypeIn && type == LinkTypeOut) { if(p->type == LinkTypeIn && type == LinkTypeOut) {
if(link_filter(filter, pad, p->filter, p->pad_idx, log_ctx) < 0) if(link_filter(filter, pad, p->filter, p->pad_idx, log_ctx) < 0)
goto fail; return -1;
} else if(p->type == LinkTypeOut && type == LinkTypeIn) { } else if(p->type == LinkTypeOut && type == LinkTypeIn) {
if(link_filter(p->filter, p->pad_idx, filter, pad, log_ctx) < 0) if(link_filter(p->filter, p->pad_idx, filter, pad, log_ctx) < 0)
goto fail; return -1;
} else { } else {
av_log(log_ctx, AV_LOG_ERROR, av_log(log_ctx, AV_LOG_ERROR,
"Two links named '%s' are either both input or both output\n", "Two links named '%s' are either both input or both output\n",
name); name);
goto fail; return -1;
} }
p->filter = NULL; p->filter = NULL;
return 0; return 0;
fail:
return -1;
} }

5
libavfilter/graphparser.h
View File

@ -35,6 +35,9 @@
* @param outpad pad index of the output * @param outpad pad index of the output
* @return zero on success, -1 on error * @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 */ #endif /* FFMPEG_GRAPHPARSER_H */