mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 01:02:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

update for get_param changes

Browse source 
Remove the const from the GstCaps.
Fix some GstStructure leaks.
This commit is contained in:
Wim Taymans 2012-03-27 12:44:02 +02:00
parent 6c260d732c
commit bee3d7b683
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/video/gstvideopool.c
View file

@ -170,7 +170,7 @@ video_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config)
GstVideoBufferPool *vpool = GST_VIDEO_BUFFER_POOL_CAST (pool); GstVideoBufferPool *vpool = GST_VIDEO_BUFFER_POOL_CAST (pool);
GstVideoBufferPoolPrivate *priv = vpool->priv; GstVideoBufferPoolPrivate *priv = vpool->priv;
GstVideoInfo info; GstVideoInfo info;
const GstCaps *caps; GstCaps *caps;
gint width, height; gint width, height;
GstAllocator *allocator; GstAllocator *allocator;
GstAllocationParams params; GstAllocationParams params;

2
sys/ximage/ximagepool.c
View file

@ -481,7 +481,7 @@ ximage_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config)
GstXImageBufferPool *xpool = GST_XIMAGE_BUFFER_POOL_CAST (pool); GstXImageBufferPool *xpool = GST_XIMAGE_BUFFER_POOL_CAST (pool);
GstXImageBufferPoolPrivate *priv = xpool->priv; GstXImageBufferPoolPrivate *priv = xpool->priv;
GstVideoInfo info; GstVideoInfo info;
const GstCaps *caps; GstCaps *caps;
if (!gst_buffer_pool_config_get_params (config, &caps, NULL, NULL, NULL)) if (!gst_buffer_pool_config_get_params (config, &caps, NULL, NULL, NULL))
goto wrong_config; goto wrong_config;

3
sys/ximage/ximagesink.c
View file

@ -1440,7 +1440,7 @@ gst_ximagesink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
g_mutex_unlock (ximagesink->flow_lock); g_mutex_unlock (ximagesink->flow_lock);
if (pool != NULL) { if (pool != NULL) {
const GstCaps *pcaps; GstCaps *pcaps;
/* we had a pool, check caps */ /* we had a pool, check caps */
config = gst_buffer_pool_get_config (pool); config = gst_buffer_pool_get_config (pool);
@ -1454,6 +1454,7 @@ gst_ximagesink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
gst_object_unref (pool); gst_object_unref (pool);
pool = NULL; pool = NULL;
} }
gst_structure_free (config);
} }
if (pool == NULL && need_pool) { if (pool == NULL && need_pool) {
GstVideoInfo info; GstVideoInfo info;

2
sys/xvimage/xvimagepool.c
View file

@ -517,7 +517,7 @@ xvimage_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config)
GstXvImageBufferPool *xvpool = GST_XVIMAGE_BUFFER_POOL_CAST (pool); GstXvImageBufferPool *xvpool = GST_XVIMAGE_BUFFER_POOL_CAST (pool);
GstXvImageBufferPoolPrivate *priv = xvpool->priv; GstXvImageBufferPoolPrivate *priv = xvpool->priv;
GstVideoInfo info; GstVideoInfo info;
const GstCaps *caps; GstCaps *caps;
if (!gst_buffer_pool_config_get_params (config, &caps, NULL, NULL, NULL)) if (!gst_buffer_pool_config_get_params (config, &caps, NULL, NULL, NULL))
goto wrong_config; goto wrong_config;

4
sys/xvimage/xvimagesink.c
View file

@ -1954,7 +1954,7 @@ gst_xvimagesink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
g_mutex_unlock (xvimagesink->flow_lock); g_mutex_unlock (xvimagesink->flow_lock);
if (pool != NULL) { if (pool != NULL) {
const GstCaps *pcaps; GstCaps *pcaps;
/* we had a pool, check caps */ /* we had a pool, check caps */
GST_DEBUG_OBJECT (xvimagesink, "check existing pool 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"); GST_DEBUG_OBJECT (xvimagesink, "pool has different caps");
/* different caps, we can't use this pool */ /* different caps, we can't use this pool */
gst_object_unref (pool); gst_object_unref (pool);
gst_structure_free (config);
pool = NULL; pool = NULL;
} }
gst_structure_free (config);
} }
if (pool == NULL && need_pool) { if (pool == NULL && need_pool) {
GstVideoInfo info; GstVideoInfo info;