X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst%2Fgstpluginloader.c;h=a933a4bc4efca1e47e1fd000ebdfa30b4072be22;hb=ce43de86902c4e9c8ed4e9682602664cb9bce2ee;hp=dbd341dd1c6710e30a99d984f5286b96ec7393ed;hpb=f7189624674b0b282ae22086e7c5a467426cd27b;p=platform%2Fupstream%2Fgstreamer.git diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c index dbd341d..a933a4b 100644 --- a/gst/gstpluginloader.c +++ b/gst/gstpluginloader.c @@ -339,7 +339,7 @@ static void plugin_loader_create_blacklist_plugin (GstPluginLoader * l, PendingPluginEntry * entry) { - GstPlugin *plugin = g_object_newv (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; @@ -408,7 +408,7 @@ gst_plugin_loader_use_usr_bin_arch (void) 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) @@ -419,9 +419,10 @@ gst_plugin_loader_try_helper (GstPluginLoader * loader, gchar * location) #endif argv[c++] = location; argv[c++] = (char *) "-l"; + argv[c++] = _gst_executable_path; 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 { @@ -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_build_filename (basedir, "lib", "gstreamer-" GST_API_VERSION, - "gst-plugin-scanner.exe", NULL); + g_build_filename (basedir, GST_PLUGIN_SCANNER_SUBDIR, + "gstreamer-" GST_API_VERSION, "gst-plugin-scanner.exe", NULL); g_free (basedir); } #else