[vlc-commits] [Git][videolan/vlc][3.0.x] live555: fix build with versions >= 2024.11.28

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
5f8320a6 by Florian Albrechtskirchinger at 2025-09-17T08:40:57+00:00
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<char>`, 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)

- - - - -


1 changed file:

- modules/access/live555.cpp


Changes:

=====================================
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? */



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/5f8320a612b206f707bc88d3f40d99d8b4139a0d

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/5f8320a612b206f707bc88d3f40d99d8b4139a0d
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance