mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 07:28:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

pad: handle NULL callbacks

Browse source 
When we have a matching NULL callback, also consider the 'callback' marshalled,
this way blocking probes with a NULL callback actually work.
This commit is contained in:
Wim Taymans 2012-02-21 16:37:11 +01:00
parent ef5292c2ab
commit c105b467fa
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/gstpad.c
View file

@ -2849,6 +2849,8 @@ probe_hook_marshal (GHook * hook, ProbeMarshall * data)
"hook %lu, cookie %u with flags 0x%08x matches", hook->hook_id, "hook %lu, cookie %u with flags 0x%08x matches", hook->hook_id,
PROBE_COOKIE (hook), flags); PROBE_COOKIE (hook), flags);
data->marshalled = TRUE;
callback = (GstPadProbeCallback) hook->func; callback = (GstPadProbeCallback) hook->func;
if (callback == NULL) if (callback == NULL)
return; return;
@ -2860,7 +2862,6 @@ probe_hook_marshal (GHook * hook, ProbeMarshall * data)
ret = callback (pad, info, hook->data); ret = callback (pad, info, hook->data);
GST_OBJECT_LOCK (pad); GST_OBJECT_LOCK (pad);
data->marshalled = TRUE;
switch (ret) { switch (ret) {
case GST_PAD_PROBE_REMOVE: case GST_PAD_PROBE_REMOVE: