fix for allocator API changes
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 9 Jul 2012 14:27:10 +0000 (16:27 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 9 Jul 2012 14:28:41 +0000 (16:28 +0200)
gst/isomp4/qtdemux.c
sys/v4l2/gstv4l2bufferpool.c

index 4e069e6..edd2747 100644 (file)
@@ -1796,7 +1796,7 @@ static void
 gst_qtdemux_stream_free (GstQTDemux * qtdemux, QtDemuxStream * stream)
 {
   if (stream->allocator)
-    gst_allocator_unref (stream->allocator);
+    gst_object_unref (stream->allocator);
   while (stream->buffers) {
     gst_buffer_unref (GST_BUFFER_CAST (stream->buffers->data));
     stream->buffers = g_slist_delete_link (stream->buffers, stream->buffers);
@@ -5027,7 +5027,7 @@ qtdemux_do_allocation (GstQTDemux * qtdemux, QtDemuxStream * stream)
   }
 
   if (stream->allocator)
-    gst_allocator_unref (stream->allocator);
+    gst_object_unref (stream->allocator);
 
   if (gst_query_get_n_allocation_params (query) > 0) {
     /* try the allocator */
index 9cabb90..235c861 100644 (file)
@@ -356,9 +356,9 @@ gst_v4l2_buffer_pool_set_config (GstBufferPool * bpool, GstStructure * config)
   pool->num_buffers = num_buffers;
   pool->copy_threshold = copy_threshold;
   if (pool->allocator)
-    gst_allocator_unref (pool->allocator);
+    gst_object_unref (pool->allocator);
   if ((pool->allocator = allocator))
-    gst_allocator_ref (allocator);
+    gst_object_ref (allocator);
   pool->params = params;
 
   gst_buffer_pool_config_set_params (config, caps, size, min_buffers,
@@ -887,7 +887,7 @@ gst_v4l2_buffer_pool_finalize (GObject * object)
   if (pool->video_fd >= 0)
     v4l2_close (pool->video_fd);
   if (pool->allocator)
-    gst_allocator_unref (pool->allocator);
+    gst_object_unref (pool->allocator);
   g_free (pool->buffers);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);