From 3b2762a5b203c130558710ac78d4507d3256dd65 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 20 Jun 2007 11:09:03 +0000 Subject: [PATCH] gst/playback/gstdecodebin2.c: When handling a delayed-caps notification case, mark the group as dynamic so that the n... Original commit message from CVS: * gst/playback/gstdecodebin2.c: (analyze_new_pad): When handling a delayed-caps notification case, mark the group as dynamic so that the nbdynamic count is incremented and decremented correctly. Fixes: #449156 Patch by: Wim Taymans --- ChangeLog | 8 ++++++++ gst/playback/gstdecodebin2.c | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64eb2a6202..6d9249eed6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-06-20 Jan Schmidt + + * gst/playback/gstdecodebin2.c: (analyze_new_pad): + When handling a delayed-caps notification case, mark + the group as dynamic so that the nbdynamic count is + incremented and decremented correctly. Fixes: #449156 + Patch by: Wim Taymans + 2007-06-19 Andy Wingo * gst-libs/gst/audio/gstbaseaudiosink.c diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c index 12e63d5a6a..1f17cd34c0 100644 --- a/gst/playback/gstdecodebin2.c +++ b/gst/playback/gstdecodebin2.c @@ -838,10 +838,14 @@ any_caps: setup_caps_delay: { /* connect to caps notification */ - if (group) + if (group) { + GROUP_MUTEX_LOCK (group); + group->nbdynamic++; + GST_LOG ("Group %p has now %d dynamic elements", group, group->nbdynamic); + GROUP_MUTEX_UNLOCK (group); g_signal_connect (G_OBJECT (pad), "notify::caps", G_CALLBACK (caps_notify_group_cb), group); - else + } else g_signal_connect (G_OBJECT (pad), "notify::caps", G_CALLBACK (caps_notify_cb), dbin); return;