Commit 311437a3 authored by Laurent Aimar's avatar Laurent Aimar Committed by Jean-Baptiste Kempf

Fixed a segfault with opengl provider.

(cherry picked from commit 7d5dbadace37c60324afb93d0c572776da0dc658)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 6fe1bf34
...@@ -633,12 +633,29 @@ static vout_window_t *VoutDisplayNewWindow(vout_display_t *vd, const vout_window ...@@ -633,12 +633,29 @@ static vout_window_t *VoutDisplayNewWindow(vout_display_t *vd, const vout_window
{ {
vout_display_owner_sys_t *osys = vd->owner.sys; vout_display_owner_sys_t *osys = vd->owner.sys;
#ifdef ALLOW_DUMMY_VOUT
if (!osys->vout->p) {
vout_window_cfg_t cfg_override = *cfg;
if (!var_InheritBool(osys->vout, "embedded-video"))
cfg_override.is_standalone = true;
return vout_window_New(VLC_OBJECT(osys->vout), NULL, &cfg_override);
}
#endif
return vout_NewDisplayWindow(osys->vout, vd, cfg); return vout_NewDisplayWindow(osys->vout, vd, cfg);
} }
static void VoutDisplayDelWindow(vout_display_t *vd, vout_window_t *window) static void VoutDisplayDelWindow(vout_display_t *vd, vout_window_t *window)
{ {
vout_display_owner_sys_t *osys = vd->owner.sys; vout_display_owner_sys_t *osys = vd->owner.sys;
#ifdef ALLOW_DUMMY_VOUT
if (!osys->vout->p) {
if( window)
vout_window_Delete(window);
return;
}
#endif
vout_DeleteDisplayWindow(osys->vout, vd, window); vout_DeleteDisplayWindow(osys->vout, vd, window);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment