diff options
author | Tim-Philipp Müller <tim@centricular.com> | 2021-05-23 23:51:27 +0100 |
---|---|---|
committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-06-02 14:21:02 +0000 |
commit | 577dabf7b1ec020e8fb3e0b9106cabc40d0978b2 (patch) | |
tree | 81b65a4ce952d8757f2171e48008d0ac2caa6065 /ext | |
parent | eb47c5aa2d7ec0158b7819c792871f6575840769 (diff) |
Use g_memdup2() where available and add fallback for older GLib versions
g_memdup() is deprecated since GLib 2.68 and we want to avoid
deprecation warnings with recent versions of GLib.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1171>
Diffstat (limited to 'ext')
-rw-r--r-- | ext/alsa/gstalsamidisrc.c | 2 | ||||
-rw-r--r-- | ext/ogg/gstoggdemux.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/alsa/gstalsamidisrc.c b/ext/alsa/gstalsamidisrc.c index 881656284..e388f42cf 100644 --- a/ext/alsa/gstalsamidisrc.c +++ b/ext/alsa/gstalsamidisrc.c @@ -420,7 +420,7 @@ push_buffer (GstAlsaMidiSrc * alsamidisrc, gpointer data, guint size, GST_BUFFER_DTS (buffer) = time; GST_BUFFER_PTS (buffer) = time; - local_data = g_memdup (data, size); + local_data = g_memdup2 (data, size); gst_buffer_append_memory (buffer, gst_memory_new_wrapped (0, local_data, size, 0, size, local_data, diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index c8d61a8f6..0b1a104d8 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -87,7 +87,7 @@ _ogg_packet_copy (const ogg_packet * packet) ogg_packet *ret = g_slice_new (ogg_packet); *ret = *packet; - ret->packet = g_memdup (packet->packet, packet->bytes); + ret->packet = g_memdup2 (packet->packet, packet->bytes); return ret; } @@ -105,9 +105,9 @@ gst_ogg_page_copy (ogg_page * page) ogg_page *p = g_slice_new (ogg_page); /* make a copy of the page */ - p->header = g_memdup (page->header, page->header_len); + p->header = g_memdup2 (page->header, page->header_len); p->header_len = page->header_len; - p->body = g_memdup (page->body, page->body_len); + p->body = g_memdup2 (page->body, page->body_len); p->body_len = page->body_len; return p; |