[SCM] libav/experimental: Make link_filter_inouts() return meaningful error codes.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:18:44 UTC 2013
The following commit has been merged in the experimental branch:
commit 684ade4935c2d3b28e7da516a5e51d67b424d1f9
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date: Sun Nov 7 18:39:58 2010 +0000
Make link_filter_inouts() return meaningful error codes.
Originally committed as revision 25693 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index 35b6845..fad8b75 100644
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -194,7 +194,7 @@ static int link_filter_inouts(AVFilterContext *filter,
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(AVFilterContext *filter,
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(AVFilterContext *filter,
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;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list