From 60cb1718af7f358cae68a316e388a86c937e5c88 Mon Sep 17 00:00:00 2001 From: Alexander Drozdov Date: Mon, 5 May 2025 12:11:44 +1000 Subject: [PATCH 1/3] Set minimal Ubuntu version to 22.04 for github flow 20.04 deprecated and will be removed 2025.05.15. Be ready, that 20.04 building can be brokken. I will open for 20.04 builds fixes, but it will not be automatically checked anymore. Disable ubuntu-latest for now: 22.04 and lates are same. --- .github/workflows/cmake-ci.yml | 7 ++++--- src/frame.cpp | 5 ----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cmake-ci.yml b/.github/workflows/cmake-ci.yml index e3a4db4..fc9d922 100644 --- a/.github/workflows/cmake-ci.yml +++ b/.github/workflows/cmake-ci.yml @@ -17,14 +17,15 @@ jobs: build: strategy: matrix: - os: [ubuntu-latest, macos-latest] + #os: [ubuntu-latest, macos-latest] + os: [macos-latest] build_type: [Release, Debug] skip_meson: [false] include: - - os: ubuntu-20.04 + - os: ubuntu-22.04 build_type: Release skip_meson: true - - os: ubuntu-20.04 + - os: ubuntu-22.04 build_type: Debug skip_meson: true diff --git a/src/frame.cpp b/src/frame.cpp index 2043226..3f06c6d 100644 --- a/src/frame.cpp +++ b/src/frame.cpp @@ -90,11 +90,6 @@ void avcpp_null_deleter(void* /*opaque*/, uint8_t */*data*/) namespace av { -VideoFrame::VideoFrame() -{ - -} - VideoFrame::VideoFrame(PixelFormat pixelFormat, int width, int height, int align) { m_raw->format = pixelFormat; From 5bfa610b0683557e44f081ba14efa1af1fbe779b Mon Sep 17 00:00:00 2001 From: Alexander Drozdov Date: Mon, 5 May 2025 12:42:16 +1000 Subject: [PATCH 2/3] Fix build issues with std::span --- src/frame.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/frame.h b/src/frame.h index 5620203..1093122 100644 --- a/src/frame.h +++ b/src/frame.h @@ -4,6 +4,10 @@ #include #include +#if __has_include() +#include +#endif + #include "ffmpeg.h" #include "rational.h" #include "timestamp.h" From 5190b9f02f225f5d32f576cdc3fb21e39cc36200 Mon Sep 17 00:00:00 2001 From: Alexander Drozdov Date: Mon, 5 May 2025 12:46:14 +1000 Subject: [PATCH 3/3] Fix typo in the CodecContext::setWidth() --- src/codeccontext.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/codeccontext.h b/src/codeccontext.h index 564123d..4036fb0 100644 --- a/src/codeccontext.h +++ b/src/codeccontext.h @@ -322,7 +322,7 @@ class VideoCodecContext : public CodecContextBasewidth = w; m_raw->coded_width = w;