gstreamer1.0-plugins-bad: remove two dangling patches
(From OE-Core rev: f45c7e195b23524accd4309d49516bc44acc4a49) Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
77e5a89df3
commit
f389433b25
|
@ -1,32 +0,0 @@
|
|||
From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 24 Sep 2015 19:47:32 +0300
|
||||
Subject: [PATCH] glimagesink: Downrank to marginal
|
||||
|
||||
On desktop, where there is good OpenGL, xvimagesink will come up first,
|
||||
on other platforms, OpenGL can't be trusted because it's either software (like
|
||||
in a VM) or broken (like on embedded)., so let ximagesink come above.
|
||||
|
||||
Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=751684]
|
||||
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
ext/gl/gstopengl.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c
|
||||
index a4b2540..0ccaacd 100644
|
||||
--- a/ext/gl/gstopengl.c
|
||||
+++ b/ext/gl/gstopengl.c
|
||||
@@ -101,7 +101,7 @@ plugin_init (GstPlugin * plugin)
|
||||
#endif
|
||||
|
||||
if (!gst_element_register (plugin, "glimagesink",
|
||||
- GST_RANK_SECONDARY, gst_gl_image_sink_bin_get_type ())) {
|
||||
+ GST_RANK_MARGINAL, gst_gl_image_sink_bin_get_type ())) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From 95cda7fbcf1a81289d9315c801c8e2b3d896f4cb Mon Sep 17 00:00:00 2001
|
||||
From: Haihua Hu <b55597@freescale.com>
|
||||
Date: Mon, 30 Nov 2015 09:36:09 +0800
|
||||
Subject: [PATCH 2/5] [glplugin] glwindow: fix memory leak of navigation
|
||||
thread
|
||||
|
||||
When exit navigation thread, call g_thread_join() to release
|
||||
the resource hold by it.
|
||||
|
||||
Upstream-Status: Backport [1.7.1]
|
||||
|
||||
bugzilla URL: https://bugzilla.gnome.org/show_bug.cgi?id=758820
|
||||
|
||||
Signed-off-by: Haihua Hu <b55597@freescale.com>
|
||||
---
|
||||
gst-libs/gst/gl/gstglwindow.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/gst-libs/gst/gl/gstglwindow.c b/gst-libs/gst/gl/gstglwindow.c
|
||||
index 44b74ca..42ef296 100644
|
||||
--- a/gst-libs/gst/gl/gstglwindow.c
|
||||
+++ b/gst-libs/gst/gl/gstglwindow.c
|
||||
@@ -343,6 +343,9 @@ gst_gl_window_finalize (GObject * object)
|
||||
while (window->nav_alive) {
|
||||
g_cond_wait (&window->nav_destroy_cond, &window->nav_lock);
|
||||
}
|
||||
+ /* release resource hold by navigation thread */
|
||||
+ g_thread_join(window->priv->navigation_thread);
|
||||
+ window->priv->navigation_thread = NULL;
|
||||
g_mutex_unlock (&window->nav_lock);
|
||||
}
|
||||
|
||||
--
|
||||
1.7.9.5
|
||||
|
Loading…
Reference in New Issue