vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Jan 27 21:32:24 2019 +0200| [8d0737fa2f0c17237e251e8a82e4a137dd8b452e] | committer: Rémi Denis-Courmont
vout: cosmetic change > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8d0737fa2f0c17237e251e8a82e4a137dd8b452e --- src/video_output/video_output.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index a7bb5dec29..a7994f0ad0 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -1531,18 +1531,15 @@ void vout_NextPicture(vout_thread_t *vout, vlc_tick_t *duration) if (vout->p->step.last == VLC_TICK_INVALID) vout->p->step.last = vout->p->displayed.timestamp; - if (ThreadDisplayPicture(vout, NULL)) { - vout_control_Release(&vout->p->control); - return; - } - - vout->p->step.timestamp = vout->p->displayed.timestamp; - - if (vout->p->step.last != VLC_TICK_INVALID && - vout->p->step.timestamp > vout->p->step.last) { - *duration = vout->p->step.timestamp - vout->p->step.last; - vout->p->step.last = vout->p->step.timestamp; - /* TODO advance subpicture by the duration ... */ + if (ThreadDisplayPicture(vout, NULL) == 0) { + vout->p->step.timestamp = vout->p->displayed.timestamp; + + if (vout->p->step.last != VLC_TICK_INVALID && + vout->p->step.timestamp > vout->p->step.last) { + *duration = vout->p->step.timestamp - vout->p->step.last; + vout->p->step.last = vout->p->step.timestamp; + /* TODO advance subpicture by the duration ... */ + } } vout_control_Release(&vout->p->control); } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
