Skip to content

Commit b43f75f

Browse files
committed
Add the recommended FFmpeg as submodule
1 parent 42157a2 commit b43f75f

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.github/workflows/CI.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,6 @@ jobs:
2929
sudo apt update
3030
sudo apt install cmake
3131
32-
- name: Install FFmpeg
33-
run: |
34-
git clone https://github.com/HomeOfAviSynthPlusEvolution/FFmpeg --branch custom-patches-for-lsmashsource --depth 1
35-
pushd FFmpeg
36-
./configure --enable-gpl --enable-version3 --disable-static --enable-shared --disable-all --disable-autodetect --enable-avcodec --enable-avformat --enable-swresample --enable-swscale --disable-asm --disable-debug
37-
make -j2
38-
sudo make install -j2
39-
popd
40-
rm -rf FFmpeg
41-
4232
- name: Install obuparse
4333
run : |
4434
git clone https://github.com/dwbuiten/obuparse --depth 1
@@ -79,6 +69,11 @@ jobs:
7969

8070
- name: Build AviSynth/VapourSynth plugin
8171
run: |
72+
pushd FFmpeg
73+
./configure --enable-gpl --enable-version3 --disable-static --enable-shared --disable-all --disable-autodetect --enable-avcodec --enable-avformat --enable-swresample --enable-swscale --disable-asm --disable-debug
74+
make -j2
75+
sudo make install -j2
76+
popd
8277
cmake_settings=(-S . -G Ninja -DENABLE_DAV1D=OFF -DENABLE_MFX=OFF -DENABLE_XML2=OFF -DENABLE_VPX=OFF -DENABLE_VULKAN=OFF)
8378
if [[ "${{ matrix.os }}" == "macos-latest" ]]; then
8479
cmake_settings+=(-DCMAKE_PREFIX_PATH=/opt/homebrew/opt/zlib)

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
[submodule "xxHash"]
22
path = xxHash
33
url = https://github.com/Cyan4973/xxHash
4+
[submodule "FFmpeg"]
5+
path = FFmpeg
6+
url = https://github.com/HomeOfAviSynthPlusEvolution/FFmpeg
7+
branch = custom-patches-for-lsmashsource

FFmpeg

Submodule FFmpeg added at fdc1b56

0 commit comments

Comments
 (0)