diff options
| author | Gyan Doshi <ffmpeg@gyani.pro> | 2019-06-05 19:52:04 +0530 |
|---|---|---|
| committer | Gyan Doshi <ffmpeg@gyani.pro> | 2019-06-06 10:19:14 +0530 |
| commit | 3be44900144267f657d935c31130d9377d8a722b (patch) | |
| tree | 693f00c0550cfb85900bce370c52f0d4df966dd7 /libavfilter/framesync.c | |
| parent | 0fef412dffb74fef3494f7fae0c138c32a444484 (diff) | |
| download | ffmpeg-3be44900144267f657d935c31130d9377d8a722b.tar.gz | |
avfilter/framesync: fix shortest with eof_action=pass
Shifted check of shortest to after repeatlast,
to ensure shortest=1 is always honoured.
Diffstat (limited to 'libavfilter/framesync.c')
| -rw-r--r-- | libavfilter/framesync.c | 8 |
1 files 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++) { |