mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-24 18:51:11 +00:00
Replaced deprecated win32-compatibility function with undeprecated one.
Fixes #560442.
This commit is contained in:
parent
d280a3977e
commit
7ad8d2e54c
1 changed files with 16 additions and 2 deletions
18
gst/gst.c
18
gst/gst.c
|
@ -135,6 +135,10 @@
|
||||||
static gboolean gst_initialized = FALSE;
|
static gboolean gst_initialized = FALSE;
|
||||||
static gboolean gst_deinitialized = FALSE;
|
static gboolean gst_deinitialized = FALSE;
|
||||||
|
|
||||||
|
#ifdef G_OS_WIN32
|
||||||
|
static HMODULE gst_dll_handle = NULL;
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef GST_DISABLE_REGISTRY
|
#ifndef GST_DISABLE_REGISTRY
|
||||||
static GList *plugin_paths = NULL; /* for delayed processing in post_init */
|
static GList *plugin_paths = NULL; /* for delayed processing in post_init */
|
||||||
#endif
|
#endif
|
||||||
|
@ -284,6 +288,16 @@ parse_debug_list (const gchar * list)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef G_OS_WIN32
|
||||||
|
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
||||||
|
{
|
||||||
|
if (fdwReason == DLL_PROCESS_ATTACH)
|
||||||
|
gst_dll_handle = (HMODULE) hinstDLL;
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gst_init_get_option_group:
|
* gst_init_get_option_group:
|
||||||
*
|
*
|
||||||
|
@ -728,8 +742,8 @@ scan_and_update_registry (GstRegistry * default_registry,
|
||||||
char *base_dir;
|
char *base_dir;
|
||||||
char *dir;
|
char *dir;
|
||||||
|
|
||||||
base_dir = g_win32_get_package_installation_directory (NULL,
|
base_dir = g_win32_get_package_installation_directory_of_module (
|
||||||
"libgstreamer-0.10-0.dll");
|
gst_dll_handle);
|
||||||
|
|
||||||
dir = g_build_filename (base_dir, "lib", "gstreamer-0.10", NULL);
|
dir = g_build_filename (base_dir, "lib", "gstreamer-0.10", NULL);
|
||||||
GST_DEBUG ("scanning DLL dir %s", dir);
|
GST_DEBUG ("scanning DLL dir %s", dir);
|
||||||
|
|
Loading…
Reference in a new issue