Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 1 | From f700975f514758a4a7582c2c972fa54ecfca3302 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Thu, 25 Jan 2018 17:55:02 +0200 |
| 4 | Subject: [PATCH 1/4] gst/gstpluginloader.c: when env var is set do not fall |
| 5 | through to system plugin scanner |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 6 | |
| 7 | If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that and only that. |
| 8 | |
| 9 | Falling through to the one installed on the system is problamatic in cross-compilation |
| 10 | environemnts, regardless of whether one pointed to by the env var succeeded or failed. |
| 11 | |
Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 12 | written by: Alexander Kanavin <alex.kanavin@gmail.com> |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 13 | |
| 14 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669] |
| 15 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 16 | --- |
Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 17 | gst/gstpluginloader.c | 4 +--- |
| 18 | 1 file changed, 1 insertion(+), 3 deletions(-) |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 19 | |
| 20 | diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c |
Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 21 | index d1e404d..2e00c3c 100644 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 22 | --- a/gst/gstpluginloader.c |
| 23 | +++ b/gst/gstpluginloader.c |
Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 24 | @@ -475,9 +475,7 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 25 | helper_bin = g_strdup (env); |
| 26 | res = gst_plugin_loader_try_helper (loader, helper_bin); |
| 27 | g_free (helper_bin); |
| 28 | - } |
| 29 | - |
| 30 | - if (!res) { |
| 31 | + } else { |
| 32 | GST_LOG ("Trying installed plugin scanner"); |
| 33 | |
| 34 | #ifdef G_OS_WIN32 |
| 35 | -- |
Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 36 | 2.28.0 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 37 | |