[vlc-devel] [PATCH 19/21] video_output: merge the first frame and normal playback picture handling

[Steve Lhomme]

When we have no frame we get a prerendered picture like in normal playback. The
first picture goes to displayed.current. If there's no next picture we get one
as well.
---
 src/video_output/video_output.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 64903aa47b8..64a4c3d1826 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1470,15 +1470,7 @@ static int ThreadDisplayPicture(vout_thread_sys_t *vout, vlc_tick_t *deadline)
     if (deadline)
         *deadline = INVALID_DEADLINE;
 
-    if (!sys->displayed.current)
-    {
-        sys->displayed.current =
-        ThreadDisplayPreparePicture(vout, frame_by_frame, &paused);
-        if (sys->displayed.current == NULL)
-            return VLC_EGENERIC;
-    }
-
-    if (!paused || frame_by_frame)
+    if (!paused || frame_by_frame || !sys->displayed.current)
         while (!sys->displayed.next)
         {
             picture_t *picture =
-- 
2.26.2