ffmpeg | branch: master | Gyan Doshi <ffm...@gyani.pro> | Wed Jun 5 20:10:04 2019 +0530| [3be44900144267f657d935c31130d9377d8a722b] | committer: Gyan Doshi
avfilter/framesync: fix shortest with eof_action=pass Shifted check of shortest to after repeatlast, to ensure shortest=1 is always honoured. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3be44900144267f657d935c31130d9377d8a722b --- libavfilter/framesync.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/framesync.c b/libavfilter/framesync.c index 22d3f091a3..bc95f7d904 100644 --- a/libavfilter/framesync.c +++ b/libavfilter/framesync.c @@ -127,16 +127,16 @@ int ff_framesync_configure(FFFrameSync *fs) fs->opt_shortest = 1; fs->opt_eof_action = EOF_ACTION_ENDALL; } - if (fs->opt_shortest) { - for (i = 0; i < fs->nb_in; i++) - fs->in[i].after = EXT_STOP; - } if (!fs->opt_repeatlast) { for (i = 1; i < fs->nb_in; i++) { fs->in[i].after = EXT_NULL; fs->in[i].sync = 0; } } + if (fs->opt_shortest) { + for (i = 0; i < fs->nb_in; i++) + fs->in[i].after = EXT_STOP; + } if (!fs->time_base.num) { for (i = 0; i < fs->nb_in; i++) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
