From 7d5dbadace37c60324afb93d0c572776da0dc658 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Sat, 26 Jun 2010 23:07:09 +0200 Subject: [PATCH] Fixed a segfault with opengl provider. --- src/video_output/display.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/video_output/display.c b/src/video_output/display.c index af80213e15..af73be8698 100644 --- a/src/video_output/display.c +++ b/src/video_output/display.c @@ -681,12 +681,29 @@ static vout_window_t *VoutDisplayNewWindow(vout_display_t *vd, const vout_window { 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); } static void VoutDisplayDelWindow(vout_display_t *vd, vout_window_t *window) { 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); } -- 2.39.2