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

Steve Lhomme robux4 at ycbcr.xyz
Wed Sep 16 13:14:44 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 0a63c64cc7c..0b07e4c3345 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1555,9 +1555,7 @@ static int ThreadDisplayPicture(vout_thread_sys_t *vout, vlc_tick_t *deadline)
 
         sys->displayed.current = sys->displayed.next;
         sys->displayed.next    = NULL;
-    }
-
-    if (!first && !current_needs_redisplay && !display_next_frame) {
+    } else if (!first && !current_needs_redisplay) {
         // Keep displaying the picture if there wasn't one before, the old one
         // needs a redisplay, or we need to display the next frame.
         // Otherwise return an error to wait until the next deadline.
-- 
2.26.2



More information about the vlc-devel mailing list