vlc | branch: master | Steve Lhomme <[email protected]> | Thu Jan 21 10:20:44 2021 +0100| [dba1fcdc46fb1f00cb383bbd6349a228737a9b08] | committer: Steve Lhomme
video_output: move test that is only possible in frame by frame display.current can only be set to NULL in frame by frame mode (which is wrong). > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dba1fcdc46fb1f00cb383bbd6349a228737a9b08 --- src/video_output/video_output.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index af1edea519..f794326452 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -1504,6 +1504,9 @@ static int ThreadDisplayPicture(vout_thread_sys_t *vout, vlc_tick_t *deadline) sys->displayed.current = sys->displayed.next; sys->displayed.next = NULL; + if (!sys->displayed.current) + return VLC_EGENERIC; + render_now = true; } else @@ -1572,9 +1575,6 @@ static int ThreadDisplayPicture(vout_thread_sys_t *vout, vlc_tick_t *deadline) } } - if (!sys->displayed.current) - return VLC_EGENERIC; - /* display the picture immediately */ render_now |= sys->displayed.current->b_force; int ret = ThreadDisplayRenderPicture(vout, render_now); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
