https://code.videolan.org/videolan/vlc/-/merge_requests/7709 From 2ae84a65385394637f243e37a89026a20828c657 Mon Sep 17 00:00:00 2001 From: Florian Albrechtskirchinger Date: Sun, 2 Mar 2025 08:30:43 +0100 Subject: [PATCH] live555: fix build with versions >= 2024.11.28 In the 2024.11.28 release (version 1732752000), live555 introduced `EventLoopWatchVariable` as a typedef for `std::atomic`, replacing direct use of `char` in earlier versions. Add a conditional typedef to define it as `char` for older versions, and update `event_rtsp` and `event_data` to use `EventLoopWatchVariable`. (cherry picked from commit 8befcbfa834b809602db24c9ba7456d8cfc25cdb) --- modules/access/live555.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp index e90382eeb3..a495187763 100644 --- a/modules/access/live555.cpp +++ b/modules/access/live555.cpp @@ -198,6 +198,10 @@ class RTSPClientVlc; #define CAP_SUBSESSION_PAUSE (1 << 3) #define CAPS_DEFAULT CAP_RATE_CONTROL +#if LIVEMEDIA_LIBRARY_VERSION_INT < 1732752000 // 2024.11.28 +typedef char EventLoopWatchVariable; +#endif + struct demux_sys_t { char *p_sdp; /* XXX mallocated */ @@ -236,8 +240,8 @@ struct demux_sys_t bool b_no_data; /* if we never received any data */ int i_no_data_ti; /* consecutive number of TaskInterrupt */ - char event_rtsp; - char event_data; + EventLoopWatchVariable event_rtsp; + EventLoopWatchVariable event_data; bool b_get_param; /* Does the server support GET_PARAMETER */ bool b_paused; /* Are we paused? */ -- 2.51.0