From 2773fe8f675b9383a3eb35ef3cc624e1690f4bba Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 13 Nov 2008 17:27:37 +0000 Subject: [PATCH] gst/playback/gstplaybin2.c: don't try to unlink the selector sinkpad when we don't have it yet. This can happen if an... Original commit message from CVS: * gst/playback/gstplaybin2.c: (deactivate_group): don't try to unlink the selector sinkpad when we don't have it yet. This can happen if an error occured before the group was complete. --- ChangeLog | 6 ++++++ gst/playback/gstplaybin2.c | 11 +++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01d2fdc..e67e47e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2008-11-13 Wim Taymans + * gst/playback/gstplaybin2.c: (deactivate_group): + don't try to unlink the selector sinkpad when we don't have it yet. This + can happen if an error occured before the group was complete. + +2008-11-13 Wim Taymans + * gst-libs/gst/rtp/gstrtpbuffer.c: (gst_rtp_buffer_validate_data), (gst_rtp_buffer_set_packet_len), (gst_rtp_buffer_get_packet_len), (gst_rtp_buffer_get_header_len), (gst_rtp_buffer_get_version), diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c index a81e7fc..1b33f82 100644 --- a/gst/playback/gstplaybin2.c +++ b/gst/playback/gstplaybin2.c @@ -2110,11 +2110,14 @@ deactivate_group (GstPlayBin * playbin, GstSourceGroup * group) continue; GST_DEBUG_OBJECT (playbin, "unlinking selector %s", select->media); - gst_pad_unlink (select->srcpad, select->sinkpad); - /* release back */ - gst_play_sink_release_pad (playbin->playsink, select->sinkpad); - select->sinkpad = NULL; + if (select->sinkpad) { + gst_pad_unlink (select->srcpad, select->sinkpad); + + /* release back */ + gst_play_sink_release_pad (playbin->playsink, select->sinkpad); + select->sinkpad = NULL; + } gst_object_unref (select->srcpad); select->srcpad = NULL; -- 2.7.4