[FFmpeg-cvslog] ffmpeg: with filter_complex, avoid random in<->out mapping.

Nicolas George git at videolan.org
Sat Jun 9 09:28:36 CEST 2012


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Wed May 23 13:53:42 2012 +0200| [6fef82f22df863c59446228156fb3f7ce826f5a2] | committer: Nicolas George

ffmpeg: with filter_complex, avoid random in<->out mapping.

With complex filters, an output can come from any input,
or several inputs, including inputs of a different type.
Copying the codec parameters from the first input with
the same type does not make any sense.

This does not change anything for simple 1->1 filters,
as source_index is set in that case.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6fef82f22df863c59446228156fb3f7ce826f5a2
---

 ffmpeg.c |   10 ----------
 1 file changed, 10 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 9eaad71..4fed76f 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2730,16 +2730,6 @@ static InputStream *get_input_stream(OutputStream *ost)
 {
     if (ost->source_index >= 0)
         return input_streams[ost->source_index];
-
-    if (ost->filter) {
-        FilterGraph *fg = ost->filter->graph;
-        int i;
-
-        for (i = 0; i < fg->nb_inputs; i++)
-            if (fg->inputs[i]->ist->st->codec->codec_type == ost->st->codec->codec_type)
-                return fg->inputs[i]->ist;
-    }
-
     return NULL;
 }
 



More information about the ffmpeg-cvslog mailing list