From 4ed74d3ab0ffd474d40728922f6277a1d90f69ad Mon Sep 17 00:00:00 2001 From: David Fernandez Date: Thu, 13 Mar 2014 10:35:30 +0100 Subject: [PATCH] videomixer2: Solve segmentation fault when src caps are configured Change function pointers to NULL while holding the lock to avoid race conditions https://bugzilla.gnome.org/show_bug.cgi?id=701110 --- gst/videomixer/videomixer2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c index b97e0ad..2997c73 100644 --- a/gst/videomixer/videomixer2.c +++ b/gst/videomixer/videomixer2.c @@ -1642,16 +1642,16 @@ gst_videomixer2_src_setcaps (GstPad * pad, GstVideoMixer2 * mix, GstCaps * caps) GST_INFO_OBJECT (pad, "set src caps: %" GST_PTR_FORMAT, caps); - mix->blend = NULL; - mix->overlay = NULL; - mix->fill_checker = NULL; - mix->fill_color = NULL; - if (!gst_video_info_from_caps (&info, caps)) goto done; GST_VIDEO_MIXER2_LOCK (mix); + mix->blend = NULL; + mix->overlay = NULL; + mix->fill_checker = NULL; + mix->fill_color = NULL; + if (GST_VIDEO_INFO_FPS_N (&mix->info) != GST_VIDEO_INFO_FPS_N (&info) || GST_VIDEO_INFO_FPS_D (&mix->info) != GST_VIDEO_INFO_FPS_D (&info)) { if (mix->segment.position != -1) { -- 2.7.4