glmixer: iterator didn't advance in continue statement

Leading to a deadlock.

https://bugzilla.gnome.org/show_bug.cgi?id=760873

diff --git a/ext/gl/gstglmosaic.c b/ext/gl/gstglmosaic.c
index 83ac798..377f718 100644 (file)
--- a/ext/gl/gstglmosaic.c
+++ b/ext/gl/gstglmosaic.c
@@ -299,6 +299,7 @@ gst_gl_mosaic_callback (gpointer stuff)
       GST_DEBUG ("skipping texture:%u pad:%p width:%u height %u",
           in_tex, pad, width, height);
       count++;
+      walk = g_list_next (walk);
       continue;
     }
 

diff --git a/ext/gl/gstglstereomix.c b/ext/gl/gstglstereomix.c
index fee1080..ed604b2 100644 (file)
--- a/ext/gl/gstglstereomix.c
+++ b/ext/gl/gstglstereomix.c
@@ -505,6 +505,7 @@ gst_gl_stereo_mix_process_frames (GstGLStereoMix * mixer)
 
     if (!pad || !pad->current_buffer) {
       GST_DEBUG ("skipping texture, null frame");
+      walk = g_list_next (walk);
       continue;
     }
 

diff --git a/ext/gl/gstglvideomixer.c b/ext/gl/gstglvideomixer.c
index e48151b..72ad8c2 100644 (file)
--- a/ext/gl/gstglvideomixer.c
+++ b/ext/gl/gstglvideomixer.c
@@ -1437,11 +1437,13 @@ gst_gl_video_mixer_callback (gpointer stuff)
         || pad->alpha == 0.0f) {
       GST_DEBUG ("skipping texture:%u pad:%p width:%u height:%u alpha:%f",
           mix_pad->current_texture, pad, in_width, in_height, pad->alpha);
+      walk = g_list_next (walk);
       continue;
     }
 
     if (!_set_blend_state (video_mixer, pad)) {
       GST_FIXME_OBJECT (pad, "skipping due to incorrect blend parameters");
+      walk = g_list_next (walk);
       continue;
     }