[vlc-commits] vout_wrapper: use video splitter display plug-in

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan 12 15:52:19 2019 +0200| [df7c7ee8fc9746f11fd2a20f9fb4b6d2f9ad99f0] | committer: Rémi Denis-Courmont

vout_wrapper: use video splitter display plug-in

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

 src/video_output/vout_wrapper.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index 81c41977ce..5aba87791e 100644
--- a/src/video_output/vout_wrapper.c
+++ b/src/video_output/vout_wrapper.c
@@ -73,18 +73,19 @@ int vout_OpenWrapper(vout_thread_t *vout,
     vout_display_owner_t owner = {
         .event = VoutDisplayEvent, .sys = vout,
     };
+    const char *modlist;
+    char *modlistbuf = NULL;
 
     msg_Dbg(vout, "Opening vout display wrapper");
 
-    /* */
-    char *modlist = var_InheritString(vout, "vout");
-
-    if (splitter_name)
-        vd = vout_NewSplitter(vout, &vout->p->original, cfg, modlist, splitter_name);
+    if (splitter_name == NULL)
+        modlist = modlistbuf = var_InheritString(vout, "vout");
     else
-        vd = vout_display_New(VLC_OBJECT(vout), &vout->p->original, cfg,
-                              modlist, &owner);
-    free(modlist);
+        modlist = "splitter,none";
+
+    vd = vout_display_New(VLC_OBJECT(vout), &vout->p->original, cfg, modlist,
+                          &owner);
+    free(modlistbuf);
 
     if (vd == NULL)
         return VLC_EGENERIC;