[FFmpeg-devel] [PATCH] avfilter/dualinput: do not overwrite shortest setting from above lines

Paul B Mahol onemda at gmail.com
Sun Jun 28 19:50:39 CEST 2015


From: Nicolas George <george at nsup.org>


Signed-off-by: Paul B Mahol <onemda at gmail.com>
---
 libavfilter/dualinput.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavfilter/dualinput.c b/libavfilter/dualinput.c
index 45f6810..37535d1 100644
--- a/libavfilter/dualinput.c
+++ b/libavfilter/dualinput.c
@@ -59,7 +59,8 @@ int ff_dualinput_init(AVFilterContext *ctx, FFDualInputContext *s)
     if (s->shortest)
         in[0].after = in[1].after = EXT_STOP;
     if (!s->repeatlast) {
-        in[1].after = EXT_NULL;
+        if (!s->shortest)
+            in[1].after = EXT_NULL;
         in[1].sync  = 0;
     }
 
-- 
1.7.11.2



More information about the ffmpeg-devel mailing list