[FFmpeg-devel] [PATCH] ffmpeg: Associate output streams with the first stream of a complex filtergraph

[Michael Niedermayer]

Previously such streams where un-associated
Fixes Ticket2969

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 ffmpeg.c                 |    2 +-
 tests/ref/fate/sub2video |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 86b7162..62f5e63 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2110,7 +2110,7 @@ static int transcode_init(void)
             OutputFilter *ofilter = fg->outputs[j];
             if (ofilter->ost->source_index >= 0)
                 continue;
-            if (fg->nb_inputs != 1)
+            if (fg->nb_inputs < 1 || fg->inputs[0]->ist->dec->type != ofilter->ost->enc->type)
                 continue;
             for (k = nb_input_streams-1; k >= 0 ; k--)
                 if (fg->inputs[0]->ist == input_streams[k])
diff --git a/tests/ref/fate/sub2video b/tests/ref/fate/sub2video
index 39d00c7..ea19561 100644
--- a/tests/ref/fate/sub2video
+++ b/tests/ref/fate/sub2video
@@ -51,6 +51,7 @@
 0,         47,         47,        1,   518400, 0xde69683f
 0,         48,         48,        1,   518400, 0x7df08fba
 0,         49,         49,        1,   518400, 0xbab197ea
+0,         50,         50,        1,   518400, 0x902285d9
 1,      15355,      15355,     4733,     2094, 0x3c171425, F=0x0
 1,      48797,      48797,     2560,     2480, 0x7c0edf21, F=0x0
 1,      51433,      51433,     2366,     3059, 0xc95b8a05, F=0x0
-- 
1.7.9.5