diff options
author | Stefan Müller-Klieser <s.mueller-klieser@phytec.de> | 2016-08-04 15:27:48 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-10 10:46:29 +0100 |
commit | f389433b25bc532c9a8fc3954dc25fd5ad371ea3 (patch) | |
tree | 3c7f33c4e57d9648d04f206a3f2e0528424d217c /meta/recipes-multimedia/gstreamer | |
parent | 77e5a89df320fa4d6b6220dd8583a4e6f7964ccf (diff) | |
download | poky-f389433b25bc532c9a8fc3954dc25fd5ad371ea3.tar.gz |
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>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
2 files changed, 0 insertions, 67 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-glimagesink-Downrank-to-marginal.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-glimagesink-Downrank-to-marginal.patch deleted file mode 100644 index 1085e95e8a..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-glimagesink-Downrank-to-marginal.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Thu, 24 Sep 2015 19:47:32 +0300 | ||
4 | Subject: [PATCH] glimagesink: Downrank to marginal | ||
5 | |||
6 | On desktop, where there is good OpenGL, xvimagesink will come up first, | ||
7 | on other platforms, OpenGL can't be trusted because it's either software (like | ||
8 | in a VM) or broken (like on embedded)., so let ximagesink come above. | ||
9 | |||
10 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=751684] | ||
11 | |||
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
13 | --- | ||
14 | ext/gl/gstopengl.c | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c | ||
18 | index a4b2540..0ccaacd 100644 | ||
19 | --- a/ext/gl/gstopengl.c | ||
20 | +++ b/ext/gl/gstopengl.c | ||
21 | @@ -101,7 +101,7 @@ plugin_init (GstPlugin * plugin) | ||
22 | #endif | ||
23 | |||
24 | if (!gst_element_register (plugin, "glimagesink", | ||
25 | - GST_RANK_SECONDARY, gst_gl_image_sink_bin_get_type ())) { | ||
26 | + GST_RANK_MARGINAL, gst_gl_image_sink_bin_get_type ())) { | ||
27 | return FALSE; | ||
28 | } | ||
29 | |||
30 | -- | ||
31 | 2.1.4 | ||
32 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch deleted file mode 100755 index 3491a15e65..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 95cda7fbcf1a81289d9315c801c8e2b3d896f4cb Mon Sep 17 00:00:00 2001 | ||
2 | From: Haihua Hu <b55597@freescale.com> | ||
3 | Date: Mon, 30 Nov 2015 09:36:09 +0800 | ||
4 | Subject: [PATCH 2/5] [glplugin] glwindow: fix memory leak of navigation | ||
5 | thread | ||
6 | |||
7 | When exit navigation thread, call g_thread_join() to release | ||
8 | the resource hold by it. | ||
9 | |||
10 | Upstream-Status: Backport [1.7.1] | ||
11 | |||
12 | bugzilla URL: https://bugzilla.gnome.org/show_bug.cgi?id=758820 | ||
13 | |||
14 | Signed-off-by: Haihua Hu <b55597@freescale.com> | ||
15 | --- | ||
16 | gst-libs/gst/gl/gstglwindow.c | 3 +++ | ||
17 | 1 file changed, 3 insertions(+) | ||
18 | |||
19 | diff --git a/gst-libs/gst/gl/gstglwindow.c b/gst-libs/gst/gl/gstglwindow.c | ||
20 | index 44b74ca..42ef296 100644 | ||
21 | --- a/gst-libs/gst/gl/gstglwindow.c | ||
22 | +++ b/gst-libs/gst/gl/gstglwindow.c | ||
23 | @@ -343,6 +343,9 @@ gst_gl_window_finalize (GObject * object) | ||
24 | while (window->nav_alive) { | ||
25 | g_cond_wait (&window->nav_destroy_cond, &window->nav_lock); | ||
26 | } | ||
27 | + /* release resource hold by navigation thread */ | ||
28 | + g_thread_join(window->priv->navigation_thread); | ||
29 | + window->priv->navigation_thread = NULL; | ||
30 | g_mutex_unlock (&window->nav_lock); | ||
31 | } | ||
32 | |||
33 | -- | ||
34 | 1.7.9.5 | ||
35 | |||