[vlc-commits] vout: remove useless check

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <***@remlab.net> | Sun Dec 9 12:12:19 2018 +0200| [7f7d0a1943101fa7549916164385ec43201cbf65] | committer: Rémi Denis-Courmont

vout: remove useless check

When 'do_early_spu' is set, 'subpic' is blent and deleted earlier,
then set to NULL. So the predicate would be false anyhow.

http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7f7d0a1943101fa7549916164385ec43201cbf65

---

src/video_output/video_output.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 96d7b8c152..d4688cf885 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1200,7 +1200,7 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
if (sys->display.use_dr) {
vout_display_Prepare(vd, todisplay, subpic, todisplay->date);
} else {
- if (!do_dr_spu && !do_early_spu && sys->spu_blend && subpic)
+ if (!do_dr_spu && sys->spu_blend != NULL && subpic != NULL)
picture_BlendSubpicture(todisplay, sys->spu_blend, subpic);
vout_display_Prepare(vd, todisplay, do_dr_spu ? subpic : NULL,
todisplay->date);