[SCM] libav/experimental: Make parse_outputs() always return meaningful error codes.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:18:46 UTC 2013
The following commit has been merged in the experimental branch:
commit 0cc8b65950dca4a2d80b827a4e8b7a5effe28a55
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date: Sun Nov 7 18:40:12 2010 +0000
Make parse_outputs() always return meaningful error codes.
Originally committed as revision 25698 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index 3b49898..2929776 100644
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -277,7 +277,7 @@ static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs,
AVFilterInOut **open_inputs,
AVFilterInOut **open_outputs, AVClass *log_ctx)
{
- int pad = 0;
+ int ret, pad = 0;
while (**buf == '[') {
char *name = parse_link_name(buf, log_ctx);
@@ -287,15 +287,15 @@ static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs,
*curr_inputs = (*curr_inputs)->next;
if (!name)
- return -1;
+ return AVERROR(EINVAL);
/* First check if the label is not in the open_inputs list */
match = extract_inout(name, open_inputs);
if (match) {
- if (link_filter(input->filter, input->pad_idx,
- match->filter, match->pad_idx, log_ctx) < 0)
- return -1;
+ if ((ret = link_filter(input->filter, input->pad_idx,
+ match->filter, match->pad_idx, log_ctx)) < 0)
+ return ret;
av_free(match->name);
av_free(name);
av_free(match);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list