mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-24 16:22:37 +00:00
Make link_filter_inouts() return meaningful error codes.
Originally committed as revision 25693 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
688b9dad9c
commit
684ade4935
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user