iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branches 'bugfixes' and 'vapoursynth' into feature

This commit is contained in:
arch1t3cht 2024-07-16 16:24:44 +02:00
parent cb930ab6b2 1e20306d48 c49b604172
commit 2a9bbc05ff
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -116,7 +116,7 @@ jobs:
- name: Setup Meson - name: Setup Meson
run: | run: |
python -m pip install --upgrade pip setuptools python -m pip install --upgrade pip setuptools
pip install meson pip install meson==1.4.2
- name: Setup MSVC - name: Setup MSVC
if: matrix.config.os == 'windows-latest' && matrix.config.msvc == true if: matrix.config.os == 'windows-latest' && matrix.config.msvc == true

3
automation/vapoursynth/aegisub_vs.py
View File

@ -195,7 +195,8 @@ def wrap_lwlibavsource(filename: str, cachedir: str | None = None, **kwargs: Any
ensure_plugin("lsmas", "libvslsmashsource", "To use Aegisub's LWLibavSource wrapper, the `lsmas` plugin for VapourSynth must be installed") ensure_plugin("lsmas", "libvslsmashsource", "To use Aegisub's LWLibavSource wrapper, the `lsmas` plugin for VapourSynth must be installed")
if b"-Dcachedir" not in core.lsmas.Version()["config"]: # type: ignore import inspect
if "cachedir" not in inspect.getfullargspec(vs.core.lsmas.LWLibavSource).args:
raise vs.Error("To use Aegisub's LWLibavSource wrapper, the `lsmas` plugin must support the `cachedir` option for LWLibavSource.") raise vs.Error("To use Aegisub's LWLibavSource wrapper, the `lsmas` plugin must support the `cachedir` option for LWLibavSource.")
clip = core.lsmas.LWLibavSource(source=filename, cachefile=cachefile, **kwargs) clip = core.lsmas.LWLibavSource(source=filename, cachefile=cachefile, **kwargs)