aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-02-28 23:50:05 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-02-28 23:52:56 +0800
commit8b11603943c0613cde51e7a27b05e75d2addca98 (patch)
tree5bfa734badcbc5d20c7d4ab21dacbf1f74ee1aa9 /src
parentd9f6aebd81c43e6c09376899ed926a94d1cdd5b5 (diff)
downloadgsoc2013-empathy-8b11603943c0613cde51e7a27b05e75d2addca98.tar
gsoc2013-empathy-8b11603943c0613cde51e7a27b05e75d2addca98.tar.gz
gsoc2013-empathy-8b11603943c0613cde51e7a27b05e75d2addca98.tar.bz2
gsoc2013-empathy-8b11603943c0613cde51e7a27b05e75d2addca98.tar.lz
gsoc2013-empathy-8b11603943c0613cde51e7a27b05e75d2addca98.tar.xz
gsoc2013-empathy-8b11603943c0613cde51e7a27b05e75d2addca98.tar.zst
gsoc2013-empathy-8b11603943c0613cde51e7a27b05e75d2addca98.zip
audio-sink: don't unref subpad
Part of my commit ed191caba6658b580db78a1802f2c8293e4564fb was wrong. subpad is added to the bin so gst_element_add_pad() takes its reference. https://bugzilla.gnome.org/show_bug.cgi?id=670745
Diffstat (limited to 'src')
-rw-r--r--src/empathy-audio-sink.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c
index b4680a0fb..2968fb53c 100644
--- a/src/empathy-audio-sink.c
+++ b/src/empathy-audio-sink.c
@@ -301,7 +301,7 @@ empathy_audio_sink_request_new_pad (GstElement *element,
EmpathyGstAudioSink *self = EMPATHY_GST_AUDIO_SINK (element);
GstElement *bin, *resample, *audioconvert0, *audioconvert1;
GstPad *pad = NULL;
- GstPad *subpad = NULL, *filterpad;
+ GstPad *subpad, *filterpad;
bin = gst_bin_new (NULL);
@@ -364,7 +364,6 @@ empathy_audio_sink_request_new_pad (GstElement *element,
pad = gst_ghost_pad_new (name, subpad);
g_assert (pad != NULL);
- gst_object_unref (subpad);
if (!gst_element_sync_state_with_parent (bin))
goto error;
@@ -383,8 +382,6 @@ error:
gst_object_unref (pad);
}
- tp_clear_pointer (&subpad, gst_object_unref);
-
gst_object_unref (bin);
g_warning ("Failed to create output subpipeline");
return NULL;