[vlc-commits] window: owner cannot be NULL

Rémi Denis-Courmont git at videolan.org
Sun May 20 19:51:03 CEST 2018


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May 16 21:14:26 2018 +0300| [54b1c63c7d82d83401698fb57137ce9a7d57985e] | committer: Rémi Denis-Courmont

window: owner cannot be NULL

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

 src/video_output/window.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/video_output/window.c b/src/video_output/window.c
index 54af57e587..a307c5be58 100644
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -62,11 +62,8 @@ vout_window_t *vout_window_New(vlc_object_t *obj, const char *module,
     window->info.has_double_click = false;
     window->control = NULL;
     window->sys = NULL;
-
-    if (owner != NULL)
-        window->owner = *owner;
-    else
-        window->owner.resized = NULL;
+    assert(owner != NULL);
+    window->owner = *owner;
 
     w->module = vlc_module_load(window, "vout window", module, false,
                                 vout_window_start, window, cfg);



More information about the vlc-commits mailing list