[vlc-commits] commit: Fixed segfault with opengl provider. (Laurent Aimar )

[git at videolan.org]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat May  1 20:16:01 2010 +0200| [c2e2e5c16304f36a9abf0bc473081ff4798bc769] | committer: Laurent Aimar 

Fixed segfault with opengl provider.

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

 src/video_output/display.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/video_output/display.c b/src/video_output/display.c
index fb5f489..6ea5132 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -1411,7 +1411,8 @@ void vout_SendDisplayEventMouse(vout_thread_t *vout, const vlc_mouse_t *m)
 {
     vlc_mouse_t tmp;
 
-    if (spu_ProcessMouse( vout->p->p_spu, m, &vout->p->fmt_out))
+    /* The check on p_spu is needed as long as ALLOW_DUMMY_VOUT is defined */
+    if (vout->p->p_spu && spu_ProcessMouse( vout->p->p_spu, m, &vout->p->fmt_out))
         return;
 
     vlc_mutex_lock( &vout->p->vfilter_lock );
@@ -1454,6 +1455,7 @@ static void DummyVoutSendDisplayEventMouse(vout_thread_t *vout, vlc_mouse_t *fal
         p.mouse = *fallback;
         vlc_mutex_init(&p.vfilter_lock);
         p.p_vf2_chain = NULL;
+        p.p_spu = NULL;
         vout->p = &p;
     }
     vout_SendDisplayEventMouse(vout, m);