diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-27 12:44:02 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-27 12:44:02 +0200 |
| commit | bee3d7b6833d775990aa07a4c89198e78bbfab54 (patch) | |
| tree | fbc70d5f139bb794950b40b369798a3868ab1654 /sys | |
| parent | 6c260d732c3bb10e7ab0510ee47901d40a970a34 (diff) | |
update for get_param changes
Remove the const from the GstCaps.
Fix some GstStructure leaks.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/ximage/ximagepool.c | 2 | ||||
| -rw-r--r-- | sys/ximage/ximagesink.c | 3 | ||||
| -rw-r--r-- | sys/xvimage/xvimagepool.c | 2 | ||||
| -rw-r--r-- | sys/xvimage/xvimagesink.c | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/sys/ximage/ximagepool.c b/sys/ximage/ximagepool.c index 46ebe7a98c..68cc312b4d 100644 --- a/sys/ximage/ximagepool.c +++ b/sys/ximage/ximagepool.c @@ -481,7 +481,7 @@ ximage_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config) GstXImageBufferPool *xpool = GST_XIMAGE_BUFFER_POOL_CAST (pool); GstXImageBufferPoolPrivate *priv = xpool->priv; GstVideoInfo info; - const GstCaps *caps; + GstCaps *caps; if (!gst_buffer_pool_config_get_params (config, &caps, NULL, NULL, NULL)) goto wrong_config; diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c index 6578539229..cdc879040b 100644 --- a/sys/ximage/ximagesink.c +++ b/sys/ximage/ximagesink.c @@ -1440,7 +1440,7 @@ gst_ximagesink_propose_allocation (GstBaseSink * bsink, GstQuery * query) g_mutex_unlock (ximagesink->flow_lock); if (pool != NULL) { - const GstCaps *pcaps; + GstCaps *pcaps; /* we had a pool, check caps */ config = gst_buffer_pool_get_config (pool); @@ -1454,6 +1454,7 @@ gst_ximagesink_propose_allocation (GstBaseSink * bsink, GstQuery * query) gst_object_unref (pool); pool = NULL; } + gst_structure_free (config); } if (pool == NULL && need_pool) { GstVideoInfo info; diff --git a/sys/xvimage/xvimagepool.c b/sys/xvimage/xvimagepool.c index af8087a3ce..840e507beb 100644 --- a/sys/xvimage/xvimagepool.c +++ b/sys/xvimage/xvimagepool.c @@ -517,7 +517,7 @@ xvimage_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config) GstXvImageBufferPool *xvpool = GST_XVIMAGE_BUFFER_POOL_CAST (pool); GstXvImageBufferPoolPrivate *priv = xvpool->priv; GstVideoInfo info; - const GstCaps *caps; + GstCaps *caps; if (!gst_buffer_pool_config_get_params (config, &caps, NULL, NULL, NULL)) goto wrong_config; diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c index 08b6a2abc8..10fe8fd239 100644 --- a/sys/xvimage/xvimagesink.c +++ b/sys/xvimage/xvimagesink.c @@ -1954,7 +1954,7 @@ gst_xvimagesink_propose_allocation (GstBaseSink * bsink, GstQuery * query) g_mutex_unlock (xvimagesink->flow_lock); if (pool != NULL) { - const GstCaps *pcaps; + GstCaps *pcaps; /* we had a pool, check caps */ GST_DEBUG_OBJECT (xvimagesink, "check existing pool caps"); @@ -1965,9 +1965,9 @@ gst_xvimagesink_propose_allocation (GstBaseSink * bsink, GstQuery * query) GST_DEBUG_OBJECT (xvimagesink, "pool has different caps"); /* different caps, we can't use this pool */ gst_object_unref (pool); - gst_structure_free (config); pool = NULL; } + gst_structure_free (config); } if (pool == NULL && need_pool) { GstVideoInfo info; |