Fix ffmpeg installation on Windows

- Lets see if this fixes the windows build
CoSMoSoftware · Mar 23, 2024 · 6ca8473 · 6ca8473
1 parent 1e97d60
commit 6ca8473
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -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`"",