mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 18:20:44 +00:00
Code Issues 1 Projects Releases Wiki Activity

glmixer: iterator didn't advance in continue statement

Browse source 
Leading to a deadlock.

https://bugzilla.gnome.org/show_bug.cgi?id=760873
This commit is contained in:
Wang Xin-yu (王昕宇) 2016-02-24 10:45:17 +08:00 committed by Tim-Philipp Müller
parent 7e108f4763
commit 35765bec0e
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ext/gl/gstglmosaic.c
View file

@ -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;
} }

1
ext/gl/gstglstereomix.c
View file

@ -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;
} }

2
ext/gl/gstglvideomixer.c
View file

@ -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;
} }