[vlc-commits] vout: fix assert if splitter module is missing

Thomas Guillem git at videolan.org
Thu Feb 21 09:30:03 CET 2019


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Feb 20 17:38:32 2019 +0100| [5785e5d1fa92a60d9f7bb22a0240531c5b2f9450] | committer: Thomas Guillem

vout: fix assert if splitter module is missing

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

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

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 4c4f55af68..8583d7c8e9 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1665,7 +1665,8 @@ static vout_thread_t *VoutCreate(vlc_object_t *object,
     vout->p = sys;
 
     /* Get splitter name if present */
-    sys->splitter_name = var_InheritString(vout, "video-splitter");
+    sys->splitter_name = config_GetType("video-splitter") ?
+        var_InheritString(vout, "video-splitter") : NULL;
     if (sys->splitter_name != NULL) {
         var_Create(vout, "window", VLC_VAR_STRING);
         var_SetString(vout, "window", "wdummy");



More information about the vlc-commits mailing list