Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/GStreamer/gst-plugins-good.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorStéphane Cerveau <scerveau@collabora.com>2020-10-15 19:21:54 +0300
committerStéphane Cerveau <scerveau@collabora.com>2020-10-15 19:21:54 +0300
commit0429c24637f72eaa6b98c06f090d603f298e0f6a (patch)
treeeb1f45d283d0fa30398945a8a7255143e58af927 /gst
parent5fb5abc8a8f1c021238562e013a171f3c9959625 (diff)
meson: update glib minimum version to 2.56
In order to support the symbol g_enum_to_string in various project using GStreamer ( gst-validate etc.), the glib minimum version should be 2.56.0. Remove compat code as glib requirement is now > 2.56 Version used by Ubuntu 18.04 LTS Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/774>
Diffstat (limited to 'gst')
-rw-r--r--gst/isomp4/qtdemux.c27
-rw-r--r--gst/rtpmanager/gstrtpjitterbuffer.c18
-rw-r--r--gst/udp/gstudp.c6
3 files changed, 0 insertions, 51 deletions
diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
index 3e06079d0..5991ddad3 100644
--- a/gst/isomp4/qtdemux.c
+++ b/gst/isomp4/qtdemux.c
@@ -13064,33 +13064,6 @@ qtdemux_reuse_and_configure_stream (GstQTDemux * qtdemux,
return gst_qtdemux_configure_stream (qtdemux, newstream);
}
-/* g_ptr_array_find_with_equal_func is available since 2.54,
- * replacement until we can depend unconditionally on the real one in GLib */
-#if !GLIB_CHECK_VERSION(2,54,0)
-#define g_ptr_array_find_with_equal_func qtdemux_ptr_array_find_with_equal_func
-static gboolean
-qtdemux_ptr_array_find_with_equal_func (GPtrArray * haystack,
- gconstpointer needle, GEqualFunc equal_func, guint * index_)
-{
- guint i;
-
- g_return_val_if_fail (haystack != NULL, FALSE);
-
- if (equal_func == NULL)
- equal_func = g_direct_equal;
-
- for (i = 0; i < haystack->len; i++) {
- if (equal_func (g_ptr_array_index (haystack, i), needle)) {
- if (index_ != NULL)
- *index_ = i;
- return TRUE;
- }
- }
-
- return FALSE;
-}
-#endif
-
static gboolean
qtdemux_update_streams (GstQTDemux * qtdemux)
{
diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c
index 60d8ad875..f9c3aef35 100644
--- a/gst/rtpmanager/gstrtpjitterbuffer.c
+++ b/gst/rtpmanager/gstrtpjitterbuffer.c
@@ -1368,24 +1368,6 @@ gst_rtp_jitter_buffer_getcaps (GstPad * pad, GstCaps * filter)
return caps;
}
-/* g_ascii_string_to_unsigned is available since 2.54. Get rid of this wrapper
- * when we bump the version in 1.18 */
-#if !GLIB_CHECK_VERSION(2,54,0)
-#define g_ascii_string_to_unsigned _gst_jitter_buffer_ascii_string_to_unsigned
-static gboolean
-_gst_jitter_buffer_ascii_string_to_unsigned (const gchar * str, guint base,
- guint64 min, guint64 max, guint64 * out_num, GError ** error)
-{
- gchar *endptr = NULL;
- *out_num = g_ascii_strtoull (str, &endptr, base);
- if (errno)
- return FALSE;
- if (endptr == str)
- return FALSE;
- return TRUE;
-}
-#endif
-
/*
* Must be called with JBUF_LOCK held
*/
diff --git a/gst/udp/gstudp.c b/gst/udp/gstudp.c
index eb021122e..66d3f2efa 100644
--- a/gst/udp/gstudp.c
+++ b/gst/udp/gstudp.c
@@ -31,12 +31,6 @@
static gboolean
plugin_init (GstPlugin * plugin)
{
- /* not using GLIB_CHECK_VERSION on purpose, run-time version matters */
- if (glib_check_version (2, 36, 0) != NULL) {
- GST_WARNING ("Your GLib version is < 2.36, UDP multicasting support may "
- "be broken, see https://bugzilla.gnome.org/show_bug.cgi?id=688378");
- }
-
/* register info of the netaddress metadata so that we can use it from
* multiple threads right away. Note that the plugin loading is always
* serialized */