window: remove useless initializers

diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index caecdff887a7c554e1a12fc68e2a72dfd1a356e2..47c604e22a7b8a539ce739914dccebde63f4e701 100644 (file)
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -380,6 +380,8 @@ static int WindowOpen( vout_window_t *pWnd, const vout_window_cfg_t *cfg )
     CmdExecuteBlock::executeWait( CmdGenericPtr( cmd ) );
 
 #ifdef X11_SKINS
+    pWnd->display.x11 = NULL;
+
     if( !pWnd->handle.xid )
 #else
     if( !pWnd->handle.hwnd )

diff --git a/modules/video_output/xcb/window.c b/modules/video_output/xcb/window.c
index 246429dbab9054a410aa8c9b1019d41c8f92203e..6637e077242f8d7912ad81d3b9886472ec4c81cd 100644 (file)
--- a/modules/video_output/xcb/window.c
+++ b/modules/video_output/xcb/window.c
@@ -566,6 +566,7 @@ static int EmOpen (vout_window_t *wnd, const vout_window_cfg_t *cfg)
 
     p_sys->embedded = true;
     p_sys->keys = NULL;
+    wnd->display.x11 = NULL;
     wnd->handle.xid = window;
     wnd->control = Control;
     wnd->sys = p_sys;

diff --git a/src/video_output/window.c b/src/video_output/window.c
index 95d7d145bb6768f41812cb04ab1e391e1b694d91..7b8a7150394a56dfb69646487db444e97619f796 100644 (file)
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -68,28 +68,21 @@ vout_window_t *vout_window_New(vlc_object_t *obj,
 #if defined(_WIN32) || defined(__OS2__)
     case VOUT_WINDOW_TYPE_HWND:
         type = "vout window hwnd";
-        window->handle.hwnd = NULL;
         break;
 #endif
 #ifdef __APPLE__
     case VOUT_WINDOW_TYPE_NSOBJECT:
         type = "vout window nsobject";
-        window->handle.nsobject = NULL;
         break;
 #endif
     case VOUT_WINDOW_TYPE_XID:
         type = "vout window xid";
-        window->handle.xid = 0;
-        window->display.x11 = NULL;
         break;
     case VOUT_WINDOW_TYPE_ANDROID_NATIVE:
         type = "vout window anative";
-        window->handle.anativewindow = NULL;
         break;
     case VOUT_WINDOW_TYPE_WAYLAND:
         type = "vout surface wl";
-        window->handle.wl = NULL;
-        window->display.wl = NULL;
         break;
     default:
         assert(0);