Skip to content
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.

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

Fix CI #34

Merged
merged 1 commit into from
Apr 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: codespell-project/actions-codespell@v2
6 changes: 3 additions & 3 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ jobs:
CXX: g++-13

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'

- name: Install Ubuntu packages
run: |
sudo apt update
sudo apt -y install libjansson-dev nasm ninja-build
sudo apt -y install libxxhash-dev nasm ninja-build

- name: Install Python packages
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ jobs:
runs-on: macos-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'

Expand All @@ -21,7 +21,7 @@ jobs:
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
# Skip brew update for now, see https://github.com/actions/setup-python/issues/577
# brew update
brew install ffmpeg jansson llvm meson vapoursynth
brew install ffmpeg xxhash llvm meson vapoursynth

- name: Set environment variables for Clang/LLVM
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
shell: msys2 {0}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

Expand All @@ -26,7 +26,7 @@ jobs:
git
libtool
mingw-w64-ucrt-x86_64-dav1d
mingw-w64-ucrt-x86_64-jansson
mingw-w64-ucrt-x86_64-xxhash
mingw-w64-ucrt-x86_64-meson
mingw-w64-ucrt-x86_64-nasm
mingw-w64-ucrt-x86_64-toolchain
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
ninja -C build
strip build/libbestsource.dll

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: libbestsource
path: build/libbestsource.dll
6 changes: 3 additions & 3 deletions src/avisynth.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,10 @@ class AvisynthVideoSource : public IClip {

// FIXME, does anyone use this?
// Set AR variables
Env->SetVar(Env->Sprintf("%s%s", this->VarPrefix, "BSSAR_NUM"), VP.SAR.Num);
Env->SetVar(Env->Sprintf("%s%s", this->VarPrefix, "BSSAR_DEN"), VP.SAR.Den);
Env->SetVar(Env->Sprintf("%s%s", this->VarPrefix.c_str(), "BSSAR_NUM"), VP.SAR.Num);
Env->SetVar(Env->Sprintf("%s%s", this->VarPrefix.c_str(), "BSSAR_DEN"), VP.SAR.Den);
if (VP.SAR.Num > 0 && VP.SAR.Den > 0)
Env->SetVar(Env->Sprintf("%s%s", this->VarPrefix, "BSSAR"), VP.SAR.Num / static_cast<double>(VP.SAR.Den));
Env->SetVar(Env->Sprintf("%s%s", this->VarPrefix.c_str(), "BSSAR"), VP.SAR.Num / static_cast<double>(VP.SAR.Den));

/*
FIXME, is this even relevant?
Expand Down