From 098d8ceae7e46f0c3226390dbf241fa423cf0340 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 27 Mar 2012 12:44:46 +0200 Subject: [PATCH] v4l2: update for get_param Remove const from the GstCaps. Plug some GstStructure leaks --- sys/v4l2/gstv4l2bufferpool.c | 2 +- sys/v4l2/gstv4l2sink.c | 4 +++- sys/v4l2/gstv4l2src.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c index 5d6f593..038ce51 100644 --- a/sys/v4l2/gstv4l2bufferpool.c +++ b/sys/v4l2/gstv4l2bufferpool.c @@ -242,7 +242,7 @@ gst_v4l2_buffer_pool_set_config (GstBufferPool * bpool, GstStructure * config) { GstV4l2BufferPool *pool = GST_V4L2_BUFFER_POOL (bpool); GstV4l2Object *obj = pool->obj; - const GstCaps *caps; + GstCaps *caps; guint size, min_buffers, max_buffers; GstAllocator *allocator; GstAllocationParams params; diff --git a/sys/v4l2/gstv4l2sink.c b/sys/v4l2/gstv4l2sink.c index a2e2fe5..8c0c93e 100644 --- a/sys/v4l2/gstv4l2sink.c +++ b/sys/v4l2/gstv4l2sink.c @@ -635,7 +635,7 @@ gst_v4l2sink_propose_allocation (GstBaseSink * bsink, GstQuery * query) gst_object_ref (pool); if (pool != NULL) { - const GstCaps *pcaps; + GstCaps *pcaps; GstStructure *config; /* we had a pool, check caps */ @@ -645,9 +645,11 @@ gst_v4l2sink_propose_allocation (GstBaseSink * bsink, GstQuery * query) GST_DEBUG_OBJECT (v4l2sink, "we had a pool with caps %" GST_PTR_FORMAT, pcaps); if (!gst_caps_is_equal (caps, pcaps)) { + gst_structure_free (config); gst_object_unref (pool); goto different_caps; } + gst_structure_free (config); } /* we need at least 2 buffers to operate */ gst_query_add_allocation_pool (query, pool, size, 2, 0); diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index 4c06aac..d19de4d 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -573,7 +573,7 @@ gst_v4l2src_decide_allocation (GstBaseSrc * bsrc, GstQuery * query) if (pool) { GstStructure *config; - const GstCaps *caps; + GstCaps *caps; config = gst_buffer_pool_get_config (pool); gst_buffer_pool_config_get_params (config, &caps, NULL, NULL, NULL); -- 2.7.4