[FFmpeg-cvslog] lavfi/dualinput: fix shortest option.

Nicolas George git at videolan.org
Mon Jan 20 22:41:54 CET 2014


ffmpeg | branch: release/2.1 | Nicolas George <george at nsup.org> | Sat Jan 18 00:34:17 2014 +0100| [fc5261c2190505a6d569afa6c7ada7a18b6c4998] | committer: Carl Eugen Hoyos

lavfi/dualinput: fix shortest option.

Fix trac ticket #3315.
(cherry picked from commit 2dc5980d61493e05ccb04271a685fe804d87b155)

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

 libavfilter/dualinput.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/dualinput.c b/libavfilter/dualinput.c
index 97e15cb..88f7a27 100644
--- a/libavfilter/dualinput.c
+++ b/libavfilter/dualinput.c
@@ -57,7 +57,7 @@ int ff_dualinput_init(AVFilterContext *ctx, FFDualInputContext *s)
     in[1].after  = EXT_INFINITY;
 
     if (s->shortest)
-        in[1].after = EXT_STOP;
+        in[0].after = in[1].after = EXT_STOP;
     if (!s->repeatlast) {
         in[0].after = EXT_STOP;
         in[1].sync  = 0;



More information about the ffmpeg-cvslog mailing list