[vlc-devel] [PATCH v2 05/18] video_output: remove always NULL displayed.next

Steve Lhomme robux4 at ycbcr.xyz
Tue Nov 24 11:46:28 CET 2020


---
 src/video_output/video_output.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 35f13609c02..d010c9be6f0 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -126,7 +126,6 @@ typedef struct vout_thread_sys_t
         bool        is_interlaced;
         picture_t   *decoded; // decoded picture before passed through chain_static
         picture_t   *current;
-        picture_t   *next;
     } displayed;
 
     struct {
@@ -931,12 +930,6 @@ static void ThreadFilterFlush(vout_thread_sys_t *sys, bool is_locked)
         sys->displayed.current = NULL;
     }
 
-    if (sys->displayed.next)
-    {
-        picture_Release( sys->displayed.next );
-        sys->displayed.next = NULL;
-    }
-
     if (!is_locked)
         vlc_mutex_lock(&sys->filter.lock);
     filter_chain_VideoFlush(sys->filter.chain_static);
@@ -1477,7 +1470,6 @@ static int ThreadDisplayPicture(vout_thread_sys_t *vout, vlc_tick_t *deadline)
 
     if (!sys->displayed.current)
     {
-        assert(!sys->displayed.next);
         sys->displayed.current =
             ThreadDisplayPreparePicture(vout, true, frame_by_frame, &paused);
         if (!sys->displayed.current)
@@ -1838,7 +1830,6 @@ static int vout_Start(vout_thread_sys_t *vout, vlc_video_context *vctx, const vo
     assert(sys->private.display_pool != NULL && sys->private.private_pool != NULL);
 
     sys->displayed.current       = NULL;
-    sys->displayed.next          = NULL;
     sys->displayed.decoded       = NULL;
     sys->displayed.date          = VLC_TICK_INVALID;
     sys->displayed.timestamp     = VLC_TICK_INVALID;
-- 
2.26.2



More information about the vlc-devel mailing list