[vlc-devel] [PATCH 21/21] video_output: merge some test with a previous test

Steve Lhomme robux4 at ycbcr.xyz
Tue Sep 15 14:36:26 CEST 2020


display_next_frame can only be false in this "else".
---
 src/video_output/video_output.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 1dedc24c58a..477eddf7869 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1546,9 +1546,7 @@ static int ThreadDisplayPicture(vout_thread_sys_t *vout, vlc_tick_t *deadline)
 
         sys->displayed.current = sys->displayed.next;
         sys->displayed.next    = NULL;
-    }
-
-    if (!current_needs_redisplay && !display_next_frame) {
+    } else if (!current_needs_redisplay) {
         // we don't have to redisplay the current frame or display a new frame
         // we woke up and (pre)rendered pictures for nothing
         return VLC_EGENERIC;
-- 
2.26.2



More information about the vlc-devel mailing list