mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-23 19:30:05 +00:00
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:
parent
0fef412dff
commit
3be4490014
@ -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++) {
|
||||
|
Loading…
Reference in New Issue
Block a user