From 5e52d32da8822b101e61a1f507c4fa59313ea894 Mon Sep 17 00:00:00 2001 From: robtfm <50659922+robtfm@users.noreply.github.com> Date: Wed, 15 Nov 2023 01:32:48 +0000 Subject: [PATCH] fix ffmpeg v6.0 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/package.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f9b234f..78d9aaea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,8 +64,8 @@ jobs: run: | $VCINSTALLDIR = $(& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath) Add-Content $env:GITHUB_ENV "LIBCLANG_PATH=${VCINSTALLDIR}\VC\Tools\LLVM\x64\bin`n" - Invoke-WebRequest "https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-full-shared.7z" -OutFile ffmpeg-release-full-shared.7z - 7z x ffmpeg-release-full-shared.7z + Invoke-WebRequest "https://www.gyan.dev/ffmpeg/builds/ffmpeg-6.0-full_build-shared.7z" -OutFile ffmpeg-6.0-full_build-shared.7z + 7z x ffmpeg-6.0-full_build-shared.7z mkdir ffmpeg mv ffmpeg-*/* ffmpeg/ Add-Content $env:GITHUB_ENV "FFMPEG_DIR=${pwd}\ffmpeg`n" diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 374a1a62..b298bbc8 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -99,13 +99,13 @@ jobs: run: | $VCINSTALLDIR = $(& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath) Add-Content $env:GITHUB_ENV "LIBCLANG_PATH=${VCINSTALLDIR}\VC\Tools\LLVM\x64\bin`n" - Invoke-WebRequest "https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-full-shared.7z" -OutFile ffmpeg-release-full-shared.7z - 7z x ffmpeg-release-full-shared.7z + Invoke-WebRequest "https://www.gyan.dev/ffmpeg/builds/ffmpeg-6.0-full_build-shared.7z" -OutFile ffmpeg-6.0-full_build-shared.7z + 7z x ffmpeg-6.0-full_build-shared.7z mkdir ffmpeg mv ffmpeg-*/* ffmpeg/ Add-Content $env:GITHUB_ENV "FFMPEG_DIR=${pwd}\ffmpeg`n" - Add-Content $env:GITHUB_PATH "${pwd}\ffmpeg\bin`n" - + Add-Content $env:GITHUB_PATH "${pwd}\ffmpeg\bin`n" + - name: Cargo build run: cargo build --release # run: cargo build --release ${{ matrix.target && '--target' }} ${{ matrix.target }}