diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2021-05-22 18:41:08 +0100 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-06-02 12:40:31 +0000 |
| commit | e7cc4b02d5c9dc8422b412b5e903f6bfbc00d272 (patch) | |
| tree | efe51076fc4dc67b721b3cd244e91df3b09bced7 | |
| parent | 16ef2917e24af5248dd16e96c4513d1766a1fa17 (diff) | |
Use g_memdup2() where available and add fallback for older GLib versions
Size is constant here, so no problem in any case, but g_memdup() is
now deprecated and we don't want deprecation warnings.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/merge_requests/257>
| -rw-r--r-- | ges/ges-pitivi-formatter.c | 2 | ||||
| -rw-r--r-- | meson.build | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ges/ges-pitivi-formatter.c b/ges/ges-pitivi-formatter.c index 47cef555..5bc6b8d7 100644 --- a/ges/ges-pitivi-formatter.c +++ b/ges/ges-pitivi-formatter.c @@ -476,7 +476,7 @@ make_source (GESFormatter * self, GList * reflist, GHashTable * source_table) layer = ges_layer_new (); g_object_set (layer, "auto-transition", TRUE, "priority", prio, NULL); ges_timeline_add_layer (self->timeline, layer); - g_hash_table_insert (priv->layers_table, g_memdup (&prio, + g_hash_table_insert (priv->layers_table, g_memdup2 (&prio, sizeof (guint64)), layer); } diff --git a/meson.build b/meson.build index a5df86ad..7fdb1a29 100644 --- a/meson.build +++ b/meson.build @@ -322,6 +322,10 @@ if gst_version_nano == 0 endif endif +if gio_dep.version().version_compare('< 2.67.4') + cdata.set('g_memdup2(ptr,sz)', '(G_LIKELY(((guint64)(sz)) < G_MAXUINT)) ? g_memdup(ptr,sz) : (g_abort(),NULL)') +endif + configure_file(output: 'config.h', configuration: cdata) run_command(python3, '-c', 'import shutil; shutil.copy("hooks/pre-commit.hook", ".git/hooks/pre-commit")') |