glmixer: iterator didn't advance in continue statement
Leading to a deadlock. https://bugzilla.gnome.org/show_bug.cgi?id=760873
This commit is contained in:
parent
0d50d92279
commit
a8862ac440
@ -299,6 +299,7 @@ gst_gl_mosaic_callback (gpointer stuff)
|
|||||||
GST_DEBUG ("skipping texture:%u pad:%p width:%u height %u",
|
GST_DEBUG ("skipping texture:%u pad:%p width:%u height %u",
|
||||||
in_tex, pad, width, height);
|
in_tex, pad, width, height);
|
||||||
count++;
|
count++;
|
||||||
|
walk = g_list_next (walk);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -505,6 +505,7 @@ gst_gl_stereo_mix_process_frames (GstGLStereoMix * mixer)
|
|||||||
|
|
||||||
if (!pad || !pad->current_buffer) {
|
if (!pad || !pad->current_buffer) {
|
||||||
GST_DEBUG ("skipping texture, null frame");
|
GST_DEBUG ("skipping texture, null frame");
|
||||||
|
walk = g_list_next (walk);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1437,11 +1437,13 @@ gst_gl_video_mixer_callback (gpointer stuff)
|
|||||||
|| pad->alpha == 0.0f) {
|
|| pad->alpha == 0.0f) {
|
||||||
GST_DEBUG ("skipping texture:%u pad:%p width:%u height:%u alpha:%f",
|
GST_DEBUG ("skipping texture:%u pad:%p width:%u height:%u alpha:%f",
|
||||||
mix_pad->current_texture, pad, in_width, in_height, pad->alpha);
|
mix_pad->current_texture, pad, in_width, in_height, pad->alpha);
|
||||||
|
walk = g_list_next (walk);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!_set_blend_state (video_mixer, pad)) {
|
if (!_set_blend_state (video_mixer, pad)) {
|
||||||
GST_FIXME_OBJECT (pad, "skipping due to incorrect blend parameters");
|
GST_FIXME_OBJECT (pad, "skipping due to incorrect blend parameters");
|
||||||
|
walk = g_list_next (walk);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user