[libav-commits] graphparser: fix the order of connecting unlabeled links.

Anton Khirnov git at libav.org
Sat Apr 14 09:26:16 CEST 2012


Module: libav
Branch: master
Commit: 4e781c25b7b1955d1a9a0b0771c3ce1acb0957bd

Author:    Anton Khirnov <anton at khirnov.net>
Committer: Anton Khirnov <anton at khirnov.net>
Date:      Mon Apr  9 05:01:05 2012 +0200

graphparser: fix the order of connecting unlabeled links.

Right now, e.g. scale,[in]overlay would connect scale to the first
overlay input and [in] to the second, which goes against the
documentation and is unintuitive.

The bug happens because of the ordering mess in curr_inputs variable:
1) the unlabeled links from the previous filter are added to it in
correct order
2) input labels are parsed and inserted to the beginning one by one
(i.e. in reverse order)
3) curr_inputs is matched against filter inputs in reverse order

Fix the problem by always using proper ordering without trying to be
clever.

---

 libavfilter/graphparser.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index 7a899a8..ebd9cc9 100644
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -219,9 +219,9 @@ static int link_filter_inouts(AVFilterContext *filt_ctx,
                               AVFilterInOut **curr_inputs,
                               AVFilterInOut **open_inputs, void *log_ctx)
 {
-    int pad = filt_ctx->input_count, ret;
+    int pad, ret;
 
-    while (pad--) {
+    for (pad = 0; pad < filt_ctx->input_count; pad++) {
         AVFilterInOut *p = *curr_inputs;
 
         if (p)
@@ -264,6 +264,7 @@ static int link_filter_inouts(AVFilterContext *filt_ctx,
 static int parse_inputs(const char **buf, AVFilterInOut **curr_inputs,
                         AVFilterInOut **open_outputs, void *log_ctx)
 {
+    AVFilterInOut *parsed_inputs = NULL;
     int pad = 0;
 
     while (**buf == '[') {
@@ -286,12 +287,15 @@ static int parse_inputs(const char **buf, AVFilterInOut **curr_inputs,
             match->pad_idx = pad;
         }
 
-        insert_inout(curr_inputs, match);
+        append_inout(&parsed_inputs, &match);
 
         *buf += strspn(*buf, WHITESPACES);
         pad++;
     }
 
+    append_inout(&parsed_inputs, curr_inputs);
+    *curr_inputs = parsed_inputs;
+
     return pad;
 }
 



More information about the libav-commits mailing list