diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2016-09-07 10:12:18 -0400 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-09-07 18:40:57 +0300 |
| commit | f90ab92547dcc2034744ed2abab2077be804b5c6 (patch) | |
| tree | 2ea2b925333cdb5e90da92830b54fe829a5a5441 | |
| parent | d33eca6156fde0dbc303615da278c098cdb1d0f0 (diff) | |
stream: Fix leaked joined_bin
There is no need to keep a strong ref on it, and _leave_bin() was
setting it to NULL before calling g_clear_object() so it was leaked.
https://bugzilla.gnome.org/show_bug.cgi?id=766612
| m--------- | common | 0 | ||||
| -rw-r--r-- | gst/rtsp-server/rtsp-stream.c | 3 |
2 files changed, 1 insertions, 2 deletions
diff --git a/common b/common -Subproject f49c55ecd35a7436194d28297f6d6f20eb6a66f +Subproject 6f2d2093e84cc0eb99b634fa281822ebb950728 diff --git a/gst/rtsp-server/rtsp-stream.c b/gst/rtsp-server/rtsp-stream.c index c57d13d..61ffa3e 100644 --- a/gst/rtsp-server/rtsp-stream.c +++ b/gst/rtsp-server/rtsp-stream.c @@ -2768,7 +2768,7 @@ gst_rtsp_stream_join_bin (GstRTSPStream * stream, GstBin * bin, (GCallback) caps_notify, stream); } - priv->joined_bin = gst_object_ref (bin); + priv->joined_bin = bin; g_mutex_unlock (&priv->lock); return TRUE; @@ -2920,7 +2920,6 @@ gst_rtsp_stream_leave_bin (GstRTSPStream * stream, GstBin * bin, gst_rtsp_address_free (priv->server_addr_v6); priv->server_addr_v6 = NULL; - g_clear_object (&priv->joined_bin); g_mutex_unlock (&priv->lock); return TRUE; |