RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/framesync: fix shortest with eof_action=pass 

Shifted check of shortest to after repeatlast,
to ensure shortest=1 is always honoured.
This commit is contained in:
Gyan Doshi 2019-06-05 19:52:04 +05:30
parent 0fef412dff
commit 3be4490014
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/framesync.c
View File

@ -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++) {