Skip to content

Git flow update #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 5, 2025
Merged

Git flow update #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60cb171
Set minimal Ubuntu version to 22.04 for github flow
h4tr3d May 5, 2025
5bfa610
Fix build issues with std::span
h4tr3d May 5, 2025
5190b9f
Fix typo in the CodecContext::setWidth()
h4tr3d May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/cmake-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/codeccontext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ class VideoCodecContext : public CodecContextBase<Clazz, _direction, AVMEDIA_TYP

void setWidth(int w) // Note, it also sets coded_width
{
if (isValid() & !isOpened())
if (isValid() && !isOpened())
{
m_raw->width = w;
m_raw->coded_width = w;
Expand Down
5 changes: 0 additions & 5 deletions src/frame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions src/frame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
#include <memory>
#include <stdexcept>

#if __has_include(<span>)
#include <span>
#endif

#include "ffmpeg.h"
#include "rational.h"
#include "timestamp.h"
Expand Down
Loading