vlc | branch: master | Thomas Guillem <[email protected]> | Mon Sep 30 11:33:54 2019 +0200| [f25e2b1392e2b3abe1ff6219aa5bd3ae469b9e92] | committer: Thomas Guillem
player: timer: handle the unknown fps case > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f25e2b1392e2b3abe1ff6219aa5bd3ae469b9e92 --- src/player/timer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/player/timer.c b/src/player/timer.c index 53e027cedb..67a73e9d09 100644 --- a/src/player/timer.c +++ b/src/player/timer.c @@ -343,16 +343,16 @@ vlc_player_UpdateTimer(vlc_player_t *player, vlc_es_id_t *es_source, * while the clock was paused */ if (source->es == es_source && source->es) { - assert(frame_rate != 0 && frame_rate_base != 0); - if (frame_rate != source->smpte.frame_rate + if (frame_rate != 0 && frame_rate != source->smpte.frame_rate || frame_rate_base != source->smpte.frame_rate_base) { + assert(frame_rate_base != 0); player->timer.last_ts = VLC_TICK_INVALID; vlc_player_UpdateSmpteTimerFPS(player, source, frame_rate, frame_rate_base); } - if (point->ts != player->timer.last_ts) + if (point->ts != player->timer.last_ts && source->smpte.frame_rate != 0) { vlc_player_UpdateTimerSource(player, source, point->rate, point->ts, point->system_date); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
