mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-29 11:12:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add handling of c++20

Browse Source
This commit is contained in:
Isaac Connor
2025-02-05 14:26:04 -08:00
parent 7709d9bb7b
commit 1063efbbfa
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/zm_ffmpeg.cpp
View File

@@ -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()
);
}