projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
element: Enforce that elements created by gst_element_factory_create/make() are floating
[platform/upstream/gstreamer.git]
/
gst
/
gstpluginloader.c
diff --git
a/gst/gstpluginloader.c
b/gst/gstpluginloader.c
index
dbd341d
..
a933a4b
100644
(file)
--- a/
gst/gstpluginloader.c
+++ b/
gst/gstpluginloader.c
@@
-339,7
+339,7
@@
static void
plugin_loader_create_blacklist_plugin (GstPluginLoader * l,
PendingPluginEntry * entry)
{
plugin_loader_create_blacklist_plugin (GstPluginLoader * l,
PendingPluginEntry * entry)
{
- GstPlugin *plugin = g_object_new
v (GST_TYPE_PLUGIN, 0
, NULL);
+ GstPlugin *plugin = g_object_new
(GST_TYPE_PLUGIN
, NULL);
plugin->filename = g_strdup (entry->filename);
plugin->file_mtime = entry->file_mtime;
plugin->filename = g_strdup (entry->filename);
plugin->file_mtime = entry->file_mtime;
@@
-408,7
+408,7
@@
gst_plugin_loader_use_usr_bin_arch (void)
static gboolean
gst_plugin_loader_try_helper (GstPluginLoader * loader, gchar * location)
{
static gboolean
gst_plugin_loader_try_helper (GstPluginLoader * loader, gchar * location)
{
- char *argv[
5
] = { NULL, };
+ char *argv[
6
] = { NULL, };
int c = 0;
#if defined (__APPLE__) && defined (USR_BIN_ARCH_SWITCH)
int c = 0;
#if defined (__APPLE__) && defined (USR_BIN_ARCH_SWITCH)
@@
-419,9
+419,10
@@
gst_plugin_loader_try_helper (GstPluginLoader * loader, gchar * location)
#endif
argv[c++] = location;
argv[c++] = (char *) "-l";
#endif
argv[c++] = location;
argv[c++] = (char *) "-l";
+ argv[c++] = _gst_executable_path;
argv[c++] = NULL;
argv[c++] = NULL;
- if (c >
3
) {
+ if (c >
4
) {
GST_LOG ("Trying to spawn gst-plugin-scanner helper at %s with arch %s",
location, argv[1]);
} else {
GST_LOG ("Trying to spawn gst-plugin-scanner helper at %s with arch %s",
location, argv[1]);
} else {
@@
-484,8
+485,8
@@
gst_plugin_loader_spawn (GstPluginLoader * loader)
g_win32_get_package_installation_directory_of_module
(_priv_gst_dll_handle);
helper_bin =
g_win32_get_package_installation_directory_of_module
(_priv_gst_dll_handle);
helper_bin =
- g_build_filename (basedir,
"lib", "gstreamer-" GST_API_VERSION
,
- "gst-plugin-scanner.exe", NULL);
+ g_build_filename (basedir,
GST_PLUGIN_SCANNER_SUBDIR
,
+ "gst
reamer-" GST_API_VERSION, "gst
-plugin-scanner.exe", NULL);
g_free (basedir);
}
#else
g_free (basedir);
}
#else