Update ffmpeg.yml

.github/actions/libvpx/action.yml

@@ -30,7 +30,7 @@ runs:
     run: |
       call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
       md build build\include build\lib build\lib\pkgconfig dist
-      D:\a\_temp\setup-msys2\msys2.cmd -c 'cd vpx ; ./configure --prefix=../build --target=x86_64-win64-vs17 --enable-vp9-highbitdepth --disable-shared --disable-examples --disable-tools --disable-docs --disable-libyuv --disable-unit_tests --disable-postproc ; make -j ; make install ; mv ../build/lib/x64/vpxmd.lib ../build/lib/vpx.lib ; rm -rf ../build/lib/x64 ; cd ../build ; tar czf ../dist/libvpx.tgz *'
+      D:\a\_temp\setup-msys2\msys2.cmd -c 'cd vpx ; ./configure --prefix=../build --target=x86_64-win64-vs17 --enable-vp9-highbitdepth --disable-shared --disable-examples --disable-tools --disable-docs --disable-libyuv --disable-unit_tests ; make -j ; make install ; mv ../build/lib/x64/vpxmd.lib ../build/lib/vpx.lib ; rm -rf ../build/lib/x64 ; cd ../build ; tar czf ../dist/libvpx.tgz *'
   - name: Publish artifact
     uses: actions/upload-artifact@v2
     with:

.github/workflows/ffmpeg-lgpl.yaml

@@ -66,7 +66,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libvpl
       with:
-        refId: master
+        refId: v2023.3.1
         config: ${{ inputs.config }}
 
   #liboggvorbis:
@@ -143,6 +143,16 @@ jobs:
       with:
         install: base-devel binutils mingw-w64-x86_64-cmake nasm
         path-type: inherit
+    - name: Create PFX certificate
+      id: create-pfx
+      shell: pwsh
+      env:
+        PFX_CONTENT: ${{ secrets.CODESIGN_PFX }} 
+      run: |
+        $pfxPath = Join-Path -Path $env:RUNNER_TEMP -ChildPath "cert.pfx"; 
+        $encodedBytes = [System.Convert]::FromBase64String($env:PFX_CONTENT); 
+        Set-Content $pfxPath -Value $encodedBytes -AsByteStream;
+        Write-Output "::set-output name=PFX_PATH::$pfxPath";        
     - name: Set up GIT
       run: |
         git config --global core.autocrlf false
@@ -178,7 +188,7 @@ jobs:
       run: |
         call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
         md build dist
-        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../ffmpeg ; PKG_CONFIG_PATH=../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../build/include" --extra-ldflags="-LIBPATH:../build/lib" --prefix=../build --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc ${{ env.variant }} --enable-runtime-cpudetect --enable-w32threads ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../build/lib ;  rm -rf cmake pkgconfig *.la ; cd .. ; tar czf ../dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz *'
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../ffmpeg ; PKG_CONFIG_PATH=../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../build/include" --extra-ldflags="-LIBPATH:../build/lib" --prefix=../build --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc ${{ env.variant }} --enable-runtime-cpudetect --enable-w32threads --enable-cuda ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../build/lib ;  rm -rf cmake pkgconfig *.la ; cd .. ; tar czf ../dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz *'
     - name: Publish FFmpeg artifacts
       uses: actions/upload-artifact@v3
       with:

.github/workflows/ffmpeg.yml

@@ -32,7 +32,7 @@ on:
       ffmpegRef:
         type: string
         required: true
-        default: 'release/6.0' 
+        default: 'release/6.1' 
         description: 'FFmpeg refId'
         
   workflow_call:
@@ -52,7 +52,7 @@ on:
         
 env:
   vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
-  COMPONENTS: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libvorbis --enable-libopus --enable-libx264 --enable-libx265 --enable-libfdk-aac "
+  COMPONENTS: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libvorbis --enable-libopus --enable-libvpx --enable-libx264 --enable-libx265 --enable-libfdk-aac"
   NASM_EXECUTABLE: nasm
   cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
   variant: ${{ inputs.type == 'static' && ' --pkg-config-flags="--static" --disable-shared --enable-static' || ' --disable-static --enable-shared' }}
@@ -65,7 +65,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libvpl
       with:
-        refId: master
+        refId: v2023.4.0
         config: ${{ inputs.config }}
 
   liboggvorbis:
@@ -84,7 +84,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libsvtav1
       with:
-        refId: v1.4.1
+        refId: v1.7.0
         config: ${{ inputs.config }}
 
   libsnappy:
@@ -93,7 +93,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libsnappy
       with:
-        refId: 1.1.9
+        refId: 1.1.10
         config: ${{ inputs.config }}
 
   libvpx:
@@ -102,7 +102,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libvpx
       with:
-        refId: v1.13.0
+        refId: v1.13.1
         config: ${{ inputs.config }}
 
   libmp3lame:
@@ -120,7 +120,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libzimg
       with:
-        refId: release-3.0.4
+        refId: release-3.0.5
         config: ${{ inputs.config }}
 
   libopus:
@@ -129,7 +129,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libopus
       with:
-        refId: v1.3.1
+        refId: v1.4
         config: ${{ inputs.config }}
 
   libfdkaac: