[vlc-commits] opengl: remove dead code

Rémi Denis-Courmont git at videolan.org
Mon May 21 20:16:19 CEST 2018


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon May 21 20:22:06 2018 +0300| [3251556f0be13f1757165e519b98cbd818463c86] | committer: Rémi Denis-Courmont

opengl: remove dead code

Window can no longer be NULL.

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

 modules/video_output/opengl/display.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/modules/video_output/opengl/display.c b/modules/video_output/opengl/display.c
index d0335d5a50..c391a6fc48 100644
--- a/modules/video_output/opengl/display.c
+++ b/modules/video_output/opengl/display.c
@@ -95,13 +95,7 @@ static int Open (vlc_object_t *obj)
     sys->gl = NULL;
     sys->pool = NULL;
 
-    vout_window_t *surface = vout_display_NewWindow (vd, VOUT_WINDOW_TYPE_INVALID);
-    if (surface == NULL)
-    {
-        msg_Err (vd, "parent window not available");
-        goto error;
-    }
-
+    vout_window_t *surface = vd->cfg->window;
     char *gl_name = var_InheritString(surface, MODULE_VARNAME);
 
     /* VDPAU GL interop works only with GLX. Override the "gl" option to force



More information about the vlc-commits mailing list