[FFmpeg-cvslog] r25693 - trunk/libavfilter/graphparser.c
stefano
subversion
Sun Nov 7 19:39:59 CET 2010
Author: stefano
Date: Sun Nov 7 19:39:58 2010
New Revision: 25693
Log:
Make link_filter_inouts() return meaningful error codes.
Modified:
trunk/libavfilter/graphparser.c
Modified: trunk/libavfilter/graphparser.c
==============================================================================
--- trunk/libavfilter/graphparser.c Sun Nov 7 19:39:54 2010 (r25692)
+++ trunk/libavfilter/graphparser.c Sun Nov 7 19:39:58 2010 (r25693)
@@ -194,7 +194,7 @@ static int link_filter_inouts(AVFilterCo
AVFilterInOut **curr_inputs,
AVFilterInOut **open_inputs, AVClass *log_ctx)
{
- int pad = filter->input_count;
+ int pad = filter->input_count, ret;
while (pad--) {
AVFilterInOut *p = *curr_inputs;
@@ -202,14 +202,14 @@ static int link_filter_inouts(AVFilterCo
av_log(log_ctx, AV_LOG_ERROR,
"Not enough inputs specified for the \"%s\" filter.\n",
filter->filter->name);
- return -1;
+ return AVERROR(EINVAL);
}
*curr_inputs = (*curr_inputs)->next;
if (p->filter) {
- if (link_filter(p->filter, p->pad_idx, filter, pad, log_ctx))
- return -1;
+ if ((ret = link_filter(p->filter, p->pad_idx, filter, pad, log_ctx)) < 0)
+ return ret;
av_free(p->name);
av_free(p);
} else {
@@ -223,7 +223,7 @@ static int link_filter_inouts(AVFilterCo
av_log(log_ctx, AV_LOG_ERROR,
"Too many inputs specified for the \"%s\" filter.\n",
filter->filter->name);
- return -1;
+ return AVERROR(EINVAL);
}
pad = filter->output_count;
More information about the ffmpeg-cvslog
mailing list