[FFmpeg-cvslog] r25699 - trunk/libavfilter/graphparser.c
stefano
subversion
Sun Nov 7 19:40:15 CET 2010
Author: stefano
Date: Sun Nov 7 19:40:14 2010
New Revision: 25699
Log:
Make avfilter_graph_parse() always return meaningful error codes.
Modified:
trunk/libavfilter/graphparser.c
Modified: trunk/libavfilter/graphparser.c
==============================================================================
--- trunk/libavfilter/graphparser.c Sun Nov 7 19:40:12 2010 (r25698)
+++ trunk/libavfilter/graphparser.c Sun Nov 7 19:40:14 2010 (r25699)
@@ -316,7 +316,7 @@ int avfilter_graph_parse(AVFilterGraph *
AVFilterInOut *open_inputs,
AVFilterInOut *open_outputs, AVClass *log_ctx)
{
- int index = 0;
+ int index = 0, ret;
char chr = 0;
AVFilterInOut *curr_inputs = NULL;
@@ -325,24 +325,24 @@ int avfilter_graph_parse(AVFilterGraph *
AVFilterContext *filter;
filters += strspn(filters, WHITESPACES);
- if (parse_inputs(&filters, &curr_inputs, &open_outputs, log_ctx) < 0)
+ if ((ret = parse_inputs(&filters, &curr_inputs, &open_outputs, log_ctx)) < 0)
goto fail;
- if (parse_filter(&filter, &filters, graph, index, log_ctx) < 0)
+ if ((ret = parse_filter(&filter, &filters, graph, index, log_ctx)) < 0)
goto fail;
if (filter->input_count == 1 && !curr_inputs && !index) {
/* First input can be omitted if it is "[in]" */
const char *tmp = "[in]";
- if(parse_inputs(&tmp, &curr_inputs, &open_outputs, log_ctx) < 0)
+ if ((ret = parse_inputs(&tmp, &curr_inputs, &open_outputs, log_ctx)) < 0)
goto fail;
}
- if (link_filter_inouts(filter, &curr_inputs, &open_inputs, log_ctx) < 0)
+ if ((ret = link_filter_inouts(filter, &curr_inputs, &open_inputs, log_ctx)) < 0)
goto fail;
- if (parse_outputs(&filters, &curr_inputs, &open_inputs, &open_outputs,
- log_ctx) < 0)
+ if ((ret = parse_outputs(&filters, &curr_inputs, &open_inputs, &open_outputs,
+ log_ctx)) < 0)
goto fail;
filters += strspn(filters, WHITESPACES);
@@ -352,6 +352,7 @@ int avfilter_graph_parse(AVFilterGraph *
av_log(log_ctx, AV_LOG_ERROR,
"Could not find a output to link when parsing \"%s\"\n",
filters - 1);
+ ret = AVERROR(EINVAL);
goto fail;
}
index++;
@@ -361,14 +362,15 @@ int avfilter_graph_parse(AVFilterGraph *
av_log(log_ctx, AV_LOG_ERROR,
"Unable to parse graph description substring: \"%s\"\n",
filters - 1);
+ ret = AVERROR(EINVAL);
goto fail;
}
if (open_inputs && !strcmp(open_inputs->name, "out") && curr_inputs) {
/* Last output can be omitted if it is "[out]" */
const char *tmp = "[out]";
- if (parse_outputs(&tmp, &curr_inputs, &open_inputs,
- &open_outputs, log_ctx) < 0)
+ if ((ret = parse_outputs(&tmp, &curr_inputs, &open_inputs, &open_outputs,
+ log_ctx)) < 0)
goto fail;
}
@@ -379,5 +381,5 @@ int avfilter_graph_parse(AVFilterGraph *
free_inout(open_inputs);
free_inout(open_outputs);
free_inout(curr_inputs);
- return -1;
+ return ret;
}
More information about the ffmpeg-cvslog
mailing list