From cd1eb55eeec4dd29d0071b0932c26ceabe5a2738 Mon Sep 17 00:00:00 2001
From: Marvin Scholz <epirat07@gmail.com>
Date: Mon, 11 Apr 2022 22:37:09 +0200
Subject: [PATCH] access: live555: use std::min/max where applicable

---
 modules/access/live555.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index c1df51ad65..146bf2e95f 100644
--- a/modules/access/live555.cpp
+++ b/modules/access/live555.cpp
@@ -32,6 +32,7 @@
 #endif
 
 #include <inttypes.h>
+#include <algorithm>
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
@@ -1483,12 +1484,12 @@ static int Demux( demux_t *p_demux )
             }
             if( p_sys->i_pcr != VLC_TICK_INVALID )
                 es_out_SetPCR( p_demux->out, VLC_TICK_0 +
-                               __MAX(0, p_sys->i_pcr - PCR_OFF) );
+                               std::max<vlc_tick_t>(0, p_sys->i_pcr - PCR_OFF) );
         }
         else if( p_sys->i_pcr == VLC_TICK_INVALID ||
                  i_minpcr > p_sys->i_pcr + PCR_OBS )
         {
-            p_sys->i_pcr = __MAX(0, i_minpcr - PCR_OFF);
+            p_sys->i_pcr = std::max<vlc_tick_t>(0, i_minpcr - PCR_OFF);
             if( p_sys->i_pcr != VLC_TICK_INVALID )
                 es_out_SetPCR( p_demux->out, VLC_TICK_0 + p_sys->i_pcr );
         }
@@ -1900,7 +1901,7 @@ static block_t *StreamParseAsf( demux_t *p_demux, live_track_t *tk,
          */
         unsigned i_payload;
         if( b_length )
-            i_payload = __MIN( i_length_offset, i_size - i_header_size);
+            i_payload = std::min( i_length_offset, i_size - i_header_size);
         else
             i_payload = i_size - i_header_size;