summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2009-04-17 10:34:54 +0100
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2009-04-17 10:35:34 +0100
commit418760cf740332c12c3fd9cf3244af134fa9534b (patch)
tree928f4a5c4d571dd4feed6ee21b7ace6236697260
parent32904de58fcc25a25f869582676021ef0d09b639 (diff)
rtspconnection: don't use GLib-2.16 API, we require only 2.14
Fixes #579267.
-rw-r--r--gst-libs/gst/rtsp/gstrtspconnection.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/gst-libs/gst/rtsp/gstrtspconnection.c b/gst-libs/gst/rtsp/gstrtspconnection.c
index 74e735c1e..0ee93c9d3 100644
--- a/gst-libs/gst/rtsp/gstrtspconnection.c
+++ b/gst-libs/gst/rtsp/gstrtspconnection.c
@@ -2808,9 +2808,12 @@ static void
gst_rtsp_source_finalize (GSource * source)
{
GstRTSPWatch *watch = (GstRTSPWatch *) source;
+ gpointer rtsp_rec;
build_reset (&watch->builder);
+ while ((rtsp_rec = g_async_queue_try_pop (watch->messages)))
+ gst_rtsp_rec_free (rtsp_rec);
g_async_queue_unref (watch->messages);
watch->messages = NULL;
@@ -2862,7 +2865,8 @@ gst_rtsp_watch_new (GstRTSPConnection * conn,
result->conn = conn;
result->builder.state = STATE_START;
- result->messages = g_async_queue_new_full (gst_rtsp_rec_free);
+ /* FIXME: use g_async_queue_new_full() once we depend on GLib >= 2.16 */
+ result->messages = g_async_queue_new ();
result->readfd.fd = -1;
result->writefd.fd = -1;