projects
/
platform
/
upstream
/
gst-plugins-bad.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
50f9e80
)
gl: don't take an extra ref on the display on set_context
author
Matthew Waters
<ystreet00@gmail.com>
Tue, 19 Aug 2014 10:14:22 +0000
(20:14 +1000)
committer
Matthew Waters
<ystreet00@gmail.com>
Tue, 19 Aug 2014 10:18:16 +0000
(20:18 +1000)
gst_context_get_gl_display() returns a ref. Don't take another in
gst_object_replace().
gst-libs/gst/gl/gstglutils.c
patch
|
blob
|
history
diff --git
a/gst-libs/gst/gl/gstglutils.c
b/gst-libs/gst/gl/gstglutils.c
index
2d90714
..
2e1b0dd
100644
(file)
--- a/
gst-libs/gst/gl/gstglutils.c
+++ b/
gst-libs/gst/gl/gstglutils.c
@@
-767,8
+767,11
@@
gst_gl_handle_set_context (GstElement * element, GstContext * context,
}
#endif
- if (replacement)
- gst_object_replace ((GstObject **) display, (GstObject *) replacement);
+ if (replacement) {
+ GstGLDisplay *old = *display;
+ *display = replacement;
+ gst_object_unref (old);
+ }
return TRUE;
}