From 0dd87d7eb79016f66a8bf01e6ff8e91e3a5396d6 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 9 Jul 2012 16:26:17 +0200 Subject: [PATCH] fix for allocator API changes --- gst-libs/gst/video/gstvideodecoder.c | 8 ++++---- gst-libs/gst/video/gstvideopool.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c index c4a29712a8..9ed8966955 100644 --- a/gst-libs/gst/video/gstvideodecoder.c +++ b/gst-libs/gst/video/gstvideodecoder.c @@ -811,7 +811,7 @@ gst_video_decoder_finalize (GObject * object) } if (decoder->priv->allocator) { - gst_allocator_unref (decoder->priv->allocator); + gst_object_unref (decoder->priv->allocator); decoder->priv->allocator = NULL; } @@ -2666,7 +2666,7 @@ gst_video_decoder_decide_allocation_default (GstVideoDecoder * decoder, else gst_query_add_allocation_param (query, allocator, ¶ms); if (allocator) - gst_allocator_unref (allocator); + gst_object_unref (allocator); if (update_pool) gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max); @@ -2757,13 +2757,13 @@ gst_video_decoder_set_src_caps (GstVideoDecoder * decoder) gst_query_parse_nth_allocation_pool (query, 0, &pool, NULL, NULL, NULL); if (!pool) { if (allocator) - gst_allocator_unref (allocator); + gst_object_unref (allocator); ret = FALSE; goto no_decide_allocation; } if (decoder->priv->allocator) - gst_allocator_unref (decoder->priv->allocator); + gst_object_unref (decoder->priv->allocator); decoder->priv->allocator = allocator; decoder->priv->params = params; diff --git a/gst-libs/gst/video/gstvideopool.c b/gst-libs/gst/video/gstvideopool.c index 80219cb07f..d88ec4c951 100644 --- a/gst-libs/gst/video/gstvideopool.c +++ b/gst-libs/gst/video/gstvideopool.c @@ -204,9 +204,9 @@ video_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config) priv->params = params; if (priv->allocator) - gst_allocator_unref (priv->allocator); + gst_object_unref (priv->allocator); if ((priv->allocator = allocator)) - gst_allocator_ref (allocator); + gst_object_ref (allocator); /* enable metadata based on config of the pool */ priv->add_videometa = @@ -334,7 +334,7 @@ gst_video_buffer_pool_finalize (GObject * object) gst_caps_unref (priv->caps); if (priv->allocator) - gst_allocator_unref (priv->allocator); + gst_object_unref (priv->allocator); G_OBJECT_CLASS (gst_video_buffer_pool_parent_class)->finalize (object); }