Skip to content

Commit 595f570

Browse files
authored
Git flow update (#152)
* 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. * Fix build issues with std::span * Fix typo in the CodecContext::setWidth()
1 parent b691a3a commit 595f570

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.github/workflows/cmake-ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ jobs:
1717
build:
1818
strategy:
1919
matrix:
20-
os: [ubuntu-latest, macos-latest]
20+
#os: [ubuntu-latest, macos-latest]
21+
os: [macos-latest]
2122
build_type: [Release, Debug]
2223
skip_meson: [false]
2324
include:
24-
- os: ubuntu-20.04
25+
- os: ubuntu-22.04
2526
build_type: Release
2627
skip_meson: true
27-
- os: ubuntu-20.04
28+
- os: ubuntu-22.04
2829
build_type: Debug
2930
skip_meson: true
3031

src/codeccontext.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ class VideoCodecContext : public CodecContextBase<Clazz, _direction, AVMEDIA_TYP
322322

323323
void setWidth(int w) // Note, it also sets coded_width
324324
{
325-
if (isValid() & !isOpened())
325+
if (isValid() && !isOpened())
326326
{
327327
m_raw->width = w;
328328
m_raw->coded_width = w;

src/frame.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,6 @@ void avcpp_null_deleter(void* /*opaque*/, uint8_t */*data*/)
9090
namespace av
9191
{
9292

93-
VideoFrame::VideoFrame()
94-
{
95-
96-
}
97-
9893
VideoFrame::VideoFrame(PixelFormat pixelFormat, int width, int height, int align)
9994
{
10095
m_raw->format = pixelFormat;

src/frame.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
#include <memory>
55
#include <stdexcept>
66

7+
#if __has_include(<span>)
8+
#include <span>
9+
#endif
10+
711
#include "ffmpeg.h"
812
#include "rational.h"
913
#include "timestamp.h"

0 commit comments

Comments
 (0)