mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-12 18:35:35 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpfunnel: fix shutdown

Browse source 
By disposing of the ssrc_to_pad map in finalize instead of
dispose.
This commit is contained in:
Mathieu Duponchelle 2018-09-18 13:15:06 +02:00
parent 53a45b1222
commit ee461fb326
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/rtpmanager/gstrtpfunnel.c
View file

@ -408,15 +408,14 @@ gst_rtp_funnel_release_pad (GstElement * element, GstPad * pad)
} }
static void static void
gst_rtp_funnel_dispose (GObject * object) gst_rtp_funnel_finalize (GObject * object)
{ {
GstRtpFunnel *funnel = GST_RTP_FUNNEL_CAST (object); GstRtpFunnel *funnel = GST_RTP_FUNNEL_CAST (object);
g_assert (GST_ELEMENT_CAST (object)->numsinkpads == 0);
gst_caps_unref (funnel->srccaps); gst_caps_unref (funnel->srccaps);
g_hash_table_destroy (funnel->ssrc_to_pad); g_hash_table_destroy (funnel->ssrc_to_pad);
G_OBJECT_CLASS (parent_class)->dispose (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
static void static void
@ -425,7 +424,7 @@ gst_rtp_funnel_class_init (GstRtpFunnelClass * klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass); GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_rtp_funnel_dispose); gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_rtp_funnel_finalize);
gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_rtp_funnel_get_property); gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_rtp_funnel_get_property);
gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_rtp_funnel_set_property); gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_rtp_funnel_set_property);
gstelement_class->request_new_pad = gstelement_class->request_new_pad =