mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-03-30 12:49:40 +00:00
Makefile.am portability fix better error handling, this solves the g_error_free assert error some people had
Original commit message from CVS: Makefile.am portability fix better error handling, this solves the g_error_free assert error some people had
This commit is contained in:
parent
b3d5bbd72c
commit
45d414338b
2 changed files with 18 additions and 1 deletions
|
@ -191,6 +191,15 @@ gst_plugin_load_plugin (GstPlugin *plugin, GError **error)
|
|||
plugin->module = module;
|
||||
return TRUE;
|
||||
}
|
||||
else {
|
||||
/* plugin == NULL */
|
||||
g_set_error (error,
|
||||
GST_PLUGIN_ERROR,
|
||||
GST_PLUGIN_ERROR_MODULE,
|
||||
"gst_plugin_register_func failed for plugin \"%s\"",
|
||||
filename);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
else {
|
||||
g_set_error (error,
|
||||
|
@ -207,8 +216,16 @@ gst_plugin_load_plugin (GstPlugin *plugin, GError **error)
|
|||
GST_PLUGIN_ERROR_MODULE,
|
||||
"Error loading plugin %s, reason: %s\n",
|
||||
filename, g_module_error());
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* FIXME: this should not happen */
|
||||
g_set_error (error,
|
||||
GST_PLUGIN_ERROR,
|
||||
GST_PLUGIN_ERROR_MODULE,
|
||||
"Error loading plugin %s, reason: %s\n",
|
||||
filename,
|
||||
"fell of the end of the gst_plugin_load_plugin function");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
|
|
@ -25,6 +25,6 @@ libgstfaststandardscheduler_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
|||
## this is a REALLY evil hack
|
||||
## but we need to keep it as long as we have libs/gst and libs/ext
|
||||
$(top_builddir)/libs/ext/cothreads/cothreads/libcothreads-gthreads.la:
|
||||
cd $(top_builddir)/libs/ext/cothreads/cothreads && make
|
||||
cd $(top_builddir)/libs/ext/cothreads/cothreads && ${MAKE}
|
||||
|
||||
noinst_HEADERS = cothreads_compat.h
|
||||
|
|
Loading…
Reference in a new issue