OSDN Git Service

avfilter/REDUCE_FORMATS: fix bug that ended reducing too early
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jul 2013 23:55:48 +0000 (01:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jul 2013 00:48:13 +0000 (02:48 +0200)
Prior to this it was possible that format reduction was ended
before it fully propagated leading to failure later in picking
formats.
No testcase with unmodified source exists, the case was reproduced
with less aggressive list merging though.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/avfiltergraph.c

index 8c40002..177ad4f 100644 (file)
@@ -616,6 +616,7 @@ do {                                                                   \
                                                                        \
             if (!out_link->in_ ## list->nb) {                          \
                 add_format(&out_link->in_ ##list, fmt);                \
+                ret = 1;                                               \
                 break;                                                 \
             }                                                          \
                                                                        \