From 6ca8473da535ace61fe1d994c94d5657a2b0ea2b Mon Sep 17 00:00:00 2001 From: Dejan Jovasevic Date: Sat, 23 Mar 2024 14:30:01 +0100 Subject: [PATCH] Fix ffmpeg installation on Windows - Lets see if this fixes the windows build --- .github/workflows/main.yml | 3 +++ CI/windows/02_build_obs.ps1 | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7ba278e68..65e19f194 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -490,6 +490,9 @@ jobs: - name: 'Install dependencies' run: ./CI/windows/01_install_dependencies.ps1 -BuildArch ${{ env.TARGET_ARCH }} + - name: 'Fix ffmpeg installation' + run: choco install ffmpeg + - name: 'Setup plugings' run: | git stash diff --git a/CI/windows/02_build_obs.ps1 b/CI/windows/02_build_obs.ps1 index 13e1afdc3..ae4a67bfa 100644 --- a/CI/windows/02_build_obs.ps1 +++ b/CI/windows/02_build_obs.ps1 @@ -92,6 +92,9 @@ function Configure-OBS { "-DCOPIED_DEPENDENCIES=OFF", "-DCOPY_DEPENDENCIES=ON", "-DBUILD_FOR_DISTRIBUTION=ON", + "-DFFMPEG_DIR:PATH=C:\ProgramData\chocolatey\lib\ffmpeg", + "-DAVCODEC_INCLUDE_DIR:PATH=C:\ProgramData\chocolatey\lib\ffmpeg\include", + "-DAVCODEC_LIBRARY:FILEPATH=C:\ProgramData\chocolatey\lib\ffmpeg\lib\avcodec.lib", "$(if (Test-Path Env:CI) { "-DOBS_BUILD_NUMBER=${Env:GITHUB_RUN_ID}" })", "$(if (Test-Path Variable:$Quiet) { "-Wno-deprecated -Wno-dev --log-level=ERROR" })", "-Dlibwebrtc_DIR=`"C:/Program Files/libwebrtc/cmake`"",