summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hambüchen <mail@nh2.me>2020-10-02 03:39:40 +0200
committerSebastian Dröge <sebastian@centricular.com>2020-10-12 10:03:58 +0300
commitb9a5b3e5280b83553c2b8b461fd6da76e57acc60 (patch)
tree99dcb124af16ba835ecba736d2ea6f981dd76515
parent18b90887868d5aed51edcc4629b259fd0b29a381 (diff)
downloadgstreamer-plugins-bad-b9a5b3e5280b83553c2b8b461fd6da76e57acc60.tar.gz
srt: Move off deprecated `srt_socket()`.
See https://github.com/Haivision/srt/blob/73ee1e1a3e3adc2702a9a5057d101ef80447b38c/docs/API-functions.md#srt_socket `srt_create_socket()` was added in https://github.com/Haivision/srt/commit/4b897ba92d34f1829a1c6e419eeab17f0763a0fc and srt `v1.3.0` is the first release that has it. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1685>
-rw-r--r--ext/srt/gstsrtobject.c4
-rw-r--r--ext/srt/meson.build2
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/srt/gstsrtobject.c b/ext/srt/gstsrtobject.c
index d9942c27e..3f0319484 100644
--- a/ext/srt/gstsrtobject.c
+++ b/ext/srt/gstsrtobject.c
@@ -866,7 +866,7 @@ gst_srt_object_wait_connect (GstSRTObject * srtobject,
g_clear_object (&bind_addr);
- sock = srt_socket (bind_sa_family, SOCK_DGRAM, 0);
+ sock = srt_create_socket ();
if (sock == SRT_INVALID_SOCK) {
g_set_error (error, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_INIT, "%s",
srt_getlasterror_str ());
@@ -943,7 +943,7 @@ gst_srt_object_connect (GstSRTObject * srtobject, GCancellable * cancellable,
bool sender;
bool rendezvous;
- sock = srt_socket (sa_family, SOCK_DGRAM, 0);
+ sock = srt_create_socket ();
if (sock == SRT_INVALID_SOCK) {
g_set_error (error, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_INIT, "%s",
srt_getlasterror_str ());
diff --git a/ext/srt/meson.build b/ext/srt/meson.build
index f15e80440..195e8be85 100644
--- a/ext/srt/meson.build
+++ b/ext/srt/meson.build
@@ -9,7 +9,7 @@ if srt_option.disabled()
subdir_done()
endif
-srt_dep = dependency('srt', required : false)
+srt_dep = dependency('srt', version : '>=1.3.0', required : false)
if not srt_dep.found() and cc.has_header_symbol('srt/srt.h', 'srt_startup')
srt_dep = cc.find_library('srt', required : false)
endif