[vlc-commits] vout: get vout value explicitly

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jan 30 21:19:45 2018 +0200| [3d2890f9f2f285272b6fb60a7f4e5ad5726a5a21] | committer: Rémi Denis-Courmont

vout: get vout value explicitly

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

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

diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index b02a59891a..a1f2a8db9b 100644
--- a/src/video_output/vout_wrapper.c
+++ b/src/video_output/vout_wrapper.c
@@ -59,14 +59,16 @@ int vout_OpenWrapper(vout_thread_t *vout,
     /* */
     const mtime_t double_click_timeout = 300000;
     const mtime_t hide_timeout = var_CreateGetInteger(vout, "mouse-hide-timeout") * 1000;
+    char *modlist = var_InheritString(vout, "vout");
 
-    if (splitter_name) {
-        sys->display.vd = vout_NewSplitter(vout, &vout->p->original, state, "$vout", splitter_name,
+    if (splitter_name)
+        sys->display.vd = vout_NewSplitter(vout, &vout->p->original, state, modlist, splitter_name,
                                            double_click_timeout, hide_timeout);
-    } else {
-        sys->display.vd = vout_NewDisplay(vout, &vout->p->original, state, "$vout",
+    else
+        sys->display.vd = vout_NewDisplay(vout, &vout->p->original, state, modlist,
                                           double_click_timeout, hide_timeout);
-    }
+    free(modlist);
+
     if (!sys->display.vd) {
         free(sys->display.title);
         return VLC_EGENERIC;