| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From a1d7c582392c8bc87fa9411af77b20e011944357 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] gst/gstpluginloader.c: when env var is set do not fall |
| 5 | through to system plugin scanner |
| 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 | |
| 12 | Upstream-Status: Pending |
| 13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 14 | --- |
| 15 | gst/gstpluginloader.c | 4 +--- |
| 16 | 1 file changed, 1 insertion(+), 3 deletions(-) |
| 17 | |
| 18 | diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c |
| 19 | index 430829d..3a75731 100644 |
| 20 | --- a/gst/gstpluginloader.c |
| 21 | +++ b/gst/gstpluginloader.c |
| 22 | @@ -471,9 +471,7 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) |
| 23 | helper_bin = g_strdup (env); |
| 24 | res = gst_plugin_loader_try_helper (loader, helper_bin); |
| 25 | g_free (helper_bin); |
| 26 | - } |
| 27 | - |
| 28 | - if (!res) { |
| 29 | + } else { |
| 30 | GST_LOG ("Trying installed plugin scanner"); |
| 31 | |
| 32 | #ifdef G_OS_WIN32 |
| 33 | -- |
| 34 | 2.15.1 |
| 35 | |