From 397928714dbc6c8d70d2c56deeed1802a0020252 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Tue, 27 May 2014 13:55:15 +1000 Subject: [PATCH] gl/mixer: don't segfault when we don't have a buffer https://bugzilla.gnome.org/show_bug.cgi?id=729257 --- gst-libs/gst/gl/gstglmixer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gst-libs/gst/gl/gstglmixer.c b/gst-libs/gst/gl/gstglmixer.c index 89b68db8f4..ef828e078c 100644 --- a/gst-libs/gst/gl/gstglmixer.c +++ b/gst-libs/gst/gl/gstglmixer.c @@ -1648,6 +1648,11 @@ gst_gl_mixer_process_textures (GstGLMixer * mix, GstBuffer * outbuf) while (walk) { /* We walk with this list because it's ordered */ GstGLMixerPad *pad = GST_GL_MIXER_PAD (walk->data); GstGLMixerCollect *mixcol = pad->mixcol; + GstGLMixerFrameData *frame; + + frame = g_ptr_array_index (mix->frames, array_index); + frame->pad = pad; + frame->texture = 0; walk = g_slist_next (walk); @@ -1656,11 +1661,6 @@ gst_gl_mixer_process_textures (GstGLMixer * mix, GstBuffer * outbuf) gint64 stream_time; GstSegment *seg; guint in_tex; - GstGLMixerFrameData *frame; - - frame = g_ptr_array_index (mix->frames, array_index); - frame->pad = pad; - frame->texture = 0; seg = &mixcol->collect.segment;