mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 00:31:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

glfilter: do not leak pool in error cases

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=736732
This commit is contained in:
Ognyan Tonchev 2014-09-16 11:42:34 +02:00 committed by Tim-Philipp Müller
parent 3a70f04113
commit 7e21e35eac
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gst-libs/gst/gl/gstglfilter.c
View file

@ -1003,22 +1003,6 @@ gst_gl_filter_decide_allocation (GstBaseTransform * trans, GstQuery * query)
guint in_width, in_height, out_width, out_height;
GstGLContext *other_context = NULL;
gst_query_parse_allocation (query, &caps, NULL);
if (gst_query_get_n_allocation_pools (query) > 0) {
gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
update_pool = TRUE;
} else {
GstVideoInfo vinfo;
gst_video_info_init (&vinfo);
gst_video_info_from_caps (&vinfo, caps);
size = vinfo.size;
min = max = 0;
update_pool = FALSE;
}
if (!gst_gl_ensure_display (filter, &filter->display))
return FALSE;
@ -1116,6 +1100,22 @@ gst_gl_filter_decide_allocation (GstBaseTransform * trans, GstQuery * query)
goto error;
}
gst_query_parse_allocation (query, &caps, NULL);
if (gst_query_get_n_allocation_pools (query) > 0) {
gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
update_pool = TRUE;
} else {
GstVideoInfo vinfo;
gst_video_info_init (&vinfo);
gst_video_info_from_caps (&vinfo, caps);
size = vinfo.size;
min = max = 0;
update_pool = FALSE;
}
if (!pool)
pool = gst_gl_buffer_pool_new (filter->context);