From 1063efbbfa3c12f43069f0f42d0ca2585901bdbe Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 5 Feb 2025 14:26:04 -0800
Subject: [PATCH] Add handling of c++20

---
 src/zm_ffmpeg.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp
index f1cf08cbd..b00bbc2af 100644
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@@ -411,7 +411,11 @@ void zm_dump_codecpar(const AVCodecParameters *par) {
         (((AVPixelFormat)par->format == AV_PIX_FMT_NONE) ? "none" : av_get_pix_fmt_name((AVPixelFormat)par->format)),
   par->extradata_size, ByteArrayToHexString(nonstd::span<const uint8> {
     par->extradata,
+#if __cplusplus >= 202002L
+    static_cast<std::span<const unsigned char>::size_type>(par->extradata_size)
+#else
     static_cast<nonstd::span_lite::span<const unsigned char>::size_type>(par->extradata_size)
+#endif
   }).c_str(),
   par->profile,
   par->level,
@@ -451,7 +455,11 @@ void zm_dump_codec(const AVCodecContext *codec) {
         codec->extradata_size,
   ByteArrayToHexString(nonstd::span<const uint8> {
     codec->extradata,
+#if __cplusplus >= 202002L
+    static_cast<std::span<const unsigned char>::size_type>(codec->extradata_size)
+#else
     static_cast<nonstd::span_lite::span<const unsigned char>::size_type>(codec->extradata_size)
+#endif
   }).c_str()
        );
 }