From 4db4403c3faa0fca54da68244429aa3fa9da64ce Mon Sep 17 00:00:00 2001 From: Daniel Stankewitz Date: Tue, 22 Mar 2022 13:18:28 +0100 Subject: [PATCH] Update ffmpeg.yml --- .github/workflows/ffmpeg.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml index 10a8217..64314cc 100644 --- a/.github/workflows/ffmpeg.yml +++ b/.github/workflows/ffmpeg.yml @@ -426,8 +426,6 @@ jobs: with: path: cache key: cache-key - - name: Set up NASM - uses: ilammy/setup-nasm@v1.2.1 - name: Set up GIT run: | git config --global core.autocrlf false @@ -436,7 +434,7 @@ jobs: uses: actions/checkout@v3.0.0 with: repository: videolan/x265 - ref: master + ref: Release_3.5 path: x265 - name: Build X265 shell: cmd @@ -446,10 +444,7 @@ jobs: cd x265\build\vc15-x86_64 mkdir work work10 work12 cd work12 - cmake -G "Visual Studio 16 2019" ..\..\..\source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON - MSBuild.exe /property:Configuration="${{ env.winConfig }}" x265.sln - - rem D:\a\_temp\setup-msys2\msys2.cmd -c 'cmake -G "Visual Studio 16 2019" ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON ; MSBuild.exe /property:Configuration="${{ env.winConfig }}" x265.sln' + D:\a\_temp\setup-msys2\msys2.cmd -c 'cmake -G "Visual Studio 16 2019" ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON ; MSBuild.exe /property:Configuration="${{ env.winConfig }}" x265.sln' rem MSBuild.exe /property:Configuration="${{ env.winConfig }}" x265-static.vcxproj rem cp ${{ env.winConfig }}/x265-static.lib ../work/x265_12bit.lib