[vlc-commits] vout: factor, remove redundant code

Rémi Denis-Courmont git at videolan.org
Sun Dec 9 20:45:55 CET 2018


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Dec  9 12:07:36 2018 +0200| [1a7f407a84547aff731357e78aa8a457276dbf21] | committer: Rémi Denis-Courmont

vout: factor, remove redundant code

The subpicture will be released after vout_display_Display() in any
case. There is not much point deleting it early just because we can.

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

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

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index c921643f10..96d7b8c152 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1204,12 +1204,6 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
             picture_BlendSubpicture(todisplay, sys->spu_blend, subpic);
         vout_display_Prepare(vd, todisplay, do_dr_spu ? subpic : NULL,
                              todisplay->date);
-
-        if (!do_dr_spu && subpic)
-        {
-            subpicture_Delete(subpic);
-            subpic = NULL;
-        }
     }
 
     vout_chrono_Stop(&sys->render);



More information about the vlc-commits mailing list