projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
miniobject: free qdata array when the last qdata is removed
[platform/upstream/gstreamer.git]
/
gst
/
gstplugin.c
diff --git
a/gst/gstplugin.c
b/gst/gstplugin.c
index
e89f33c
..
70c942d
100644
(file)
--- a/
gst/gstplugin.c
+++ b/
gst/gstplugin.c
@@
-88,7
+88,8
@@
static char *_gst_plugin_fault_handler_filename = NULL;
* QPL: http://www.trolltech.com/licenses/qpl.html
* MPL: http://www.opensource.org/licenses/mozilla1.1.php
* MIT/X11: http://www.opensource.org/licenses/mit-license.php
* QPL: http://www.trolltech.com/licenses/qpl.html
* MPL: http://www.opensource.org/licenses/mozilla1.1.php
* MIT/X11: http://www.opensource.org/licenses/mit-license.php
- * 3-clause BSD: http://www.opensource.org/licenses/bsd-license.php
+ * 3-clause BSD: https://opensource.org/licenses/BSD-3-Clause
+ * Zero-Clause BSD: https://opensource.org/licenses/0BSD
*/
static const gchar valid_licenses[] = "LGPL\000" /* GNU Lesser General Public License */
"GPL\000" /* GNU General Public License */
*/
static const gchar valid_licenses[] = "LGPL\000" /* GNU Lesser General Public License */
"GPL\000" /* GNU General Public License */
@@
-97,10
+98,13
@@
static const gchar valid_licenses[] = "LGPL\000" /* GNU Lesser General Pu
"MPL\000" /* MPL 1.1 license */
"BSD\000" /* 3-clause BSD license */
"MIT/X11\000" /* MIT/X11 license */
"MPL\000" /* MPL 1.1 license */
"BSD\000" /* 3-clause BSD license */
"MIT/X11\000" /* MIT/X11 license */
+ "0BSD\000" /* Zero-Clause BSD */
"Proprietary\000" /* Proprietary license */
GST_LICENSE_UNKNOWN; /* some other license */
"Proprietary\000" /* Proprietary license */
GST_LICENSE_UNKNOWN; /* some other license */
-static const guint8 valid_licenses_idx[] = { 0, 5, 9, 13, 21, 25, 29, 37, 49 };
+static const guint8 valid_licenses_idx[] = { 0, 5, 9, 13, 21, 25, 29, 37, 42,
+ 54
+};
static GstPlugin *gst_plugin_register_func (GstPlugin * plugin,
const GstPluginDesc * desc, gpointer user_data);
static GstPlugin *gst_plugin_register_func (GstPlugin * plugin,
const GstPluginDesc * desc, gpointer user_data);
@@
-109,13
+113,12
@@
static void gst_plugin_desc_copy (GstPluginDesc * dest,
static void gst_plugin_ext_dep_free (GstPluginDep * dep);
static void gst_plugin_ext_dep_free (GstPluginDep * dep);
-G_DEFINE_TYPE (GstPlugin, gst_plugin, GST_TYPE_OBJECT);
+G_DEFINE_TYPE
_WITH_PRIVATE
(GstPlugin, gst_plugin, GST_TYPE_OBJECT);
static void
gst_plugin_init (GstPlugin * plugin)
{
static void
gst_plugin_init (GstPlugin * plugin)
{
- plugin->priv =
- G_TYPE_INSTANCE_GET_PRIVATE (plugin, GST_TYPE_PLUGIN, GstPluginPrivate);
+ plugin->priv = gst_plugin_get_instance_private (plugin);
}
static void
}
static void
@@
-154,8
+157,6
@@
static void
gst_plugin_class_init (GstPluginClass * klass)
{
G_OBJECT_CLASS (klass)->finalize = gst_plugin_finalize;
gst_plugin_class_init (GstPluginClass * klass)
{
G_OBJECT_CLASS (klass)->finalize = gst_plugin_finalize;
-
- g_type_class_add_private (klass, sizeof (GstPluginPrivate));
}
GQuark
}
GQuark
@@
-1309,7
+1310,8
@@
gst_plugin_find_feature_by_name (GstPlugin * plugin, const gchar * name)
*
* Load the named plugin. Refs the plugin.
*
*
* Load the named plugin. Refs the plugin.
*
- * Returns: (transfer full): a reference to a loaded plugin, or %NULL on error.
+ * Returns: (transfer full) (nullable): a reference to a loaded plugin, or
+ * %NULL on error.
*/
GstPlugin *
gst_plugin_load_by_name (const gchar * name)
*/
GstPlugin *
gst_plugin_load_by_name (const gchar * name)
@@
-1352,7
+1354,8
@@
gst_plugin_load_by_name (const gchar * name)
* plugin = loaded_plugin;
* ]|
*
* plugin = loaded_plugin;
* ]|
*
- * Returns: (transfer full): a reference to a loaded plugin, or %NULL on error.
+ * Returns: (transfer full) (nullable): a reference to a loaded plugin, or
+ * %NULL on error.
*/
GstPlugin *
gst_plugin_load (GstPlugin * plugin)
*/
GstPlugin *
gst_plugin_load (GstPlugin * plugin)
@@
-1361,7
+1364,7
@@
gst_plugin_load (GstPlugin * plugin)
GstPlugin *newplugin;
if (gst_plugin_is_loaded (plugin)) {
GstPlugin *newplugin;
if (gst_plugin_is_loaded (plugin)) {
- return
plugin
;
+ return
gst_object_ref (plugin)
;
}
if (!(newplugin = gst_plugin_load_file (plugin->filename, &error)))
}
if (!(newplugin = gst_plugin_load_file (plugin->filename, &error)))