[vlc-commits] video_output: move up a test on NULL displayed.current

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Nov 10 10:28:49 2020 +0100| [b7503cbfecfa458e45958ed78f7acfb69108ce88] | committer: Steve Lhomme

video_output: move up a test on NULL displayed.current

It can only become NULL if the next picture is not available yet in frame by
frame mode.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b7503cbfecfa458e45958ed78f7acfb69108ce88
---

 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 62c9e854fc..0107a195a8 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1497,6 +1497,9 @@ static int ThreadDisplayPicture(vout_thread_sys_t *vout, vlc_tick_t *deadline)
             sys->displayed.next = NULL;
         }
 
+        if (!sys->displayed.current)
+            return VLC_EGENERIC;
+
         render_now = true;
     }
     else
@@ -1564,9 +1567,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);