Update ffmpeg.yml

.github/actions/libfdkaac/action.yml

@@ -1,7 +1,7 @@
 name: libfdkaac
 
 inputs:
-  env:
+  refId:
     type: string
     required: true
   config:
@@ -20,22 +20,14 @@ runs:
     uses: actions/checkout@v3
     with:
       repository: mstorsjo/fdk-aac
-      ref: v2.0.2
+      ref: ${{ inputs.refId }}
       path: fdkaac
-  - name: Check cache
-    id: libfdkaac-cache
-    uses: actions/cache@v3
-    with:
-      path: dist
-      key: libfdkaac-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('fdkaac') }}
   - name: Set up MSYS2
-    if: steps.libfdkaac-cache.outputs.cache-hit != 'true'
     uses: msys2/setup-msys2@v2
     with:
       install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
       path-type: inherit
   - name: Build FDK AAC
-    if: steps.libfdkaac-cache.outputs.cache-hit != 'true'
     shell: cmd
     env:
       vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
@@ -47,5 +39,5 @@ runs:
   - name: Publish artifact
     uses: actions/upload-artifact@v2
     with:
-      name: libfdkaac-${{ inputs.env }}-${{ inputs.config }}
+      name: libfdkaac-${{ runner.os }}-${{ inputs.config }}
       path: dist/libfdkaac.tgz

.github/actions/libmp3lame/action.yml

@@ -1,7 +1,7 @@
 name: libmp3lame
 
 inputs:
-  env:
+  refId:
     type: string
     required: true
   config:
@@ -24,9 +24,9 @@ runs:
     run: |
       call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
       md build dist
-      D:\a\_temp\setup-msys2\msys2.cmd -c 'svn co https://svn.code.sf.net/p/lame/svn/tags/RELEASE__3_100/lame lame ; cd lame ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --enable-nasm --disable-frontend --disable-shared --enable-static ; make -j ; make install ; cd ../build ; tar czf ../dist/libmp3lame.tgz *
+      D:\a\_temp\setup-msys2\msys2.cmd -c 'svn co https://svn.code.sf.net/p/lame/svn/${{ inputs.refId }}/lame lame ; cd lame ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --enable-nasm --disable-frontend --disable-shared --enable-static ; make -j ; make install ; cd ../build ; tar czf ../dist/libmp3lame.tgz *
   - name: Publish artifact
     uses: actions/upload-artifact@v2
     with:
-      name: libmp3lame-${{ inputs.env }}-${{ inputs.config }}
+      name: libmp3lame-${{ runner.os }}-${{ inputs.config }}
       path: dist/libmp3lame.tgz

.github/actions/liboggvorbis/action.yml

@@ -1,7 +1,10 @@
 name: liboggvorbis
 
 inputs:
-  env:
+  libogg_refId:
+    type: string
+    required: true  
+  libvorbis_refId:
     type: string
     required: true
   config:
@@ -20,28 +23,20 @@ runs:
     uses: actions/checkout@v3
     with:
       repository: xiph/ogg
-      ref: v1.3.5
+      ref: ${{ inputs.libogg_refId }}
       path: ogg
   - name: Checkout Vorbis
     uses: actions/checkout@v3.0.0
     with:
       repository: xiph/vorbis
-      ref: v1.3.7
+      ref: ${{ inputs.libvorbis_refId }}
       path: vorbis
-  - name: Check cache
-    id: liboggvorbis-cache
-    uses: actions/cache@v3
-    with:
-      path: dist
-      key: liboggvorbis-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('ogg') }}-${{ hashFiles('vorbis') }}
   - name: Set up MSYS2
-    if: steps.liboggvorbis-cache.outputs.cache-hit != 'true'
     uses: msys2/setup-msys2@v2
     with:
       install: base-devel binutils autotools automake
       path-type: inherit
   - name: Build Ogg
-    if: steps.liboggvorbis-cache.outputs.cache-hit != 'true'
     shell: cmd
     env:
       vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
@@ -51,7 +46,6 @@ runs:
       md build
       D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ogg ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --disable-shared ; make -j ; make install'
   - name: Build Vorbis
-    if: steps.liboggvorbis-cache.outputs.cache-hit != 'true'
     shell: cmd
     env:
       vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
@@ -63,5 +57,5 @@ runs:
   - name: Publish artifact
     uses: actions/upload-artifact@v2
     with:
-      name: liboggvorbis-${{ inputs.env }}-${{ inputs.config }}
+      name: liboggvorbis-${{ runner.os }}-${{ inputs.config }}
       path: dist/liboggvorbis.tgz

.github/actions/libopus/action.yml

@@ -1,7 +1,7 @@
 name: libopus
 
 inputs:
-  env:
+  refId:
     type: string
     required: true
   config:
@@ -22,20 +22,12 @@ runs:
       repository: xiph/opus
       ref: v1.3.1
       path: opus        
-  - name: Check cache
-    id: libopus-cache
-    uses: actions/cache@v3
-    with:
-      path: dist
-      key: libopus-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('opus') }}
   - name: Set up MSYS2
-    if: steps.libopus-cache.outputs.cache-hit != 'true'
     uses: msys2/setup-msys2@v2
     with:
       install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
       path-type: inherit
   - name: Build OPUS
-    if: steps.libopus-cache.outputs.cache-hit != 'true'
     shell: cmd
     env:
       vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
@@ -50,5 +42,5 @@ runs:
   - name: Publish artifact
     uses: actions/upload-artifact@v2
     with:
-      name: libopus-${{ inputs.env }}-${{ inputs.config }}
+      name: libopus-${{ runner.os }}-${{ inputs.config }}
       path: dist/libopus.tgz

.github/actions/libsnappy/action.yml

@@ -1,7 +1,7 @@
 name: libsnappy
 
 inputs:
-  env:
+  refId:
     type: string
     required: true
   config:
@@ -20,16 +20,9 @@ runs:
     uses: actions/checkout@v3
     with:
       repository: google/snappy
-      ref: 1.1.9
+      ref: ${{ inputs.refId }}
       path: snappy
-  - name: Check cache
-    id: libsnappy-cache
-    uses: actions/cache@v3
-    with:
-      path: dist
-      key: libsnappy-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('snappy') }}
   - name: Set up MSYS2
-    if: steps.libsnappy-cache.outputs.cache-hit != 'true'
     uses: msys2/setup-msys2@v2
     with:
       install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
@@ -53,5 +46,5 @@ runs:
   - name: Publish artifact
     uses: actions/upload-artifact@v2
     with:
-      name: libsnappy-${{ inputs.env }}-${{ inputs.config }}
+      name: libsnappy-${{ runner.os }}-${{ inputs.config }}
       path: dist/libsnappy.tgz

.github/actions/libsvtav1/action.yml

@@ -1,7 +1,7 @@
 name: libsvtav1
 
 inputs:
-  env:
+  refId:
     type: string
     required: true
   config:
@@ -16,26 +16,19 @@ runs:
     run: |
       git config --global core.autocrlf false
       git config --global core.eol lf
-  - name: Checkout SVT AV1
+      git clone -b ${{ inputs.refId }} https://gitlab.com/AOMediaCodec/SVT-AV1 svtav1
-    uses: actions/checkout@v3
+  #- name: Checkout SVT AV1
-    with:
+  #  uses: actions/checkout@v3
-      repository: AOMediaCodec/SVT-AV1
+  #  with:
-      ref: v1.1.0
+  #    repository: AOMediaCodec/SVT-AV1
-      path: svtav1
+  #    ref: ${{ inputs.refId }}
-  - name: Check cache
+  #    path: svtav1
-    id: libsvtav1-cache
-    uses: actions/cache@v3
-    with:
-      path: dist
-      key: libsvtav1-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('svtav1') }}
   - name: Set up MSYS2
-    if: steps.libsvtav1-cache.outputs.cache-hit != 'true'
     uses: msys2/setup-msys2@v2
     with:
       install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
       path-type: inherit
   - name: Build SVT AV1
-    if: steps.libsvtav1-cache.outputs.cache-hit != 'true'
     shell: cmd
     env:
       vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
@@ -47,5 +40,5 @@ runs:
   - name: Publish artifact
     uses: actions/upload-artifact@v2
     with:
-      name: libsvtav1-${{ inputs.env }}-${{ inputs.config }}
+      name: libsvtav1-${{ runner.os }}-${{ inputs.config }}
       path: dist/libsvtav1.tgz

.github/actions/libvpl/action.yml

@@ -1,7 +1,7 @@
 name: libvpl
 
 inputs:
-  env:
+  refId:
     type: string
     required: true
   config:
@@ -20,26 +20,18 @@ runs:
     uses: actions/checkout@v3.0.0
     with:
       repository: oneapi-src/oneVPL
-      ref: master
+      ref: ${{ inputs.refId }}
       path: onevpl
-  - name: Check cache
-    id: libvpl-cache
-    uses: actions/cache@v3
-    with:
-      path: dist
-      key: libvpl-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('onevpl') }}
   - name: Set up MSYS2
-    if: steps.libvpl-cache.outputs.cache-hit != 'true'
     uses: msys2/setup-msys2@v2
     with:
       install: base-devel binutils autotools automake
       path-type: inherit
   - name: Build oneVPL
-    if: steps.libvpl-cache.outputs.cache-hit != 'true'
     shell: cmd
-    env:
+    #env:
-      vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+     # vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
-      msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
+     # msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
     run: |
       call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
       md temp build dist
@@ -52,5 +44,5 @@ runs:
   - name: Publish artifact
     uses: actions/upload-artifact@v2
     with:
-      name: libvpl-${{ inputs.env }}-${{ inputs.config }}
+      name: libvpl-${{ runner.os }}-${{ inputs.config }}
       path: dist/libvpl.tgz

.github/actions/libvpx/action.yml

@@ -1,7 +1,7 @@
 name: libvpx
 
 inputs:
-  env:
+  refId:
     type: string
     required: true
   config:
@@ -16,21 +16,13 @@ runs:
     run: |
       git config --global core.autocrlf false
       git config --global core.eol lf
-      git clone --depth 1 -b v1.12.0 https://github.com/webmproject/libvpx.git vpx
+      git clone --depth 1 -b ${{ inputs.refId }} https://github.com/webmproject/libvpx.git vpx
-  - name: Check cache
-    id: libvpx-cache
-    uses: actions/cache@v3
-    with:
-      path: dist
-      key: libvpx-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('vpx') }}
   - name: Set up MSYS2
-    if: steps.libvpx-cache.outputs.cache-hit != 'true'
     uses: msys2/setup-msys2@v2
     with:
       install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
       path-type: inherit
   - name: Build LibVpx
-    if: steps.libvpx-cache.outputs.cache-hit != 'true'
     shell: cmd
     env:
       vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
@@ -42,5 +34,5 @@ runs:
   - name: Publish artifact
     uses: actions/upload-artifact@v2
     with:
-      name: libvpx-${{ inputs.env }}-${{ inputs.config }}
+      name: libvpx-${{ runner.os }}-${{ inputs.config }}
       path: dist/libvpx.tgz

.github/actions/libx264/action.yml

@@ -1,7 +1,7 @@
 name: libx264
 
 inputs:
-  env:
+  refId:
     type: string
     required: true
   config:
@@ -20,22 +20,14 @@ runs:
     uses: actions/checkout@v3
     with:
       repository: mirror/x264
-      ref: stable
+      ref: ${{ inputs.refId }}
       path: x264
-  - name: Check cache
-    id: libx264-cache
-    uses: actions/cache@v3
-    with:
-      path: dist
-      key: libx264-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('x264') }}
   - name: Set up MSYS2
-    if: steps.libx264-cache.outputs.cache-hit != 'true'
     uses: msys2/setup-msys2@v2
     with:
       install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
       path-type: inherit
   - name: Build X264
-    if: steps.libx264-cache.outputs.cache-hit != 'true'
     shell: cmd
     env:
       vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
@@ -47,5 +39,5 @@ runs:
   - name: Publish artifact
     uses: actions/upload-artifact@v2
     with:
-      name: libx264-${{ inputs.env }}-${{ inputs.config }}
+      name: libx264-${{ runner.os }}-${{ inputs.config }}
       path: dist/libx264.tgz

.github/actions/libx265-10/action.yml

@@ -1,7 +1,7 @@
 name: libx265-10
 
 inputs:
-  env:
+  refId:
     type: string
     required: true
   config:
@@ -16,21 +16,12 @@ runs:
     run: |
       git config --global core.autocrlf false
       git config --global core.eol lf
-      git clone -b Release_3.5 https://github.com/videolan/x265.git x265
+      git clone -b ${{ inputs.refId }} https://github.com/videolan/x265.git x265
-  - name: Check cache
-    id: libx26510-cache
-    uses: actions/cache@v3
-    with:
-      path: dist
-      key: libx265-10-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('x265') }}
   - name: Set up MSBuild
-    if: steps.libx26510-cache.outputs.cache-hit != 'true'
     uses: microsoft/setup-msbuild@v1.1
   - name: Set up NASM
-    if: steps.libx26510-cache.outputs.cache-hit != 'true'
     uses: ilammy/setup-nasm@v1.2.1
   - name: Build X265 (10 bit)
-    if: steps.libx26510-cache.outputs.cache-hit != 'true'
     shell: cmd
     run: |
       call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
@@ -44,5 +35,5 @@ runs:
   - name: Publish artifact
     uses: actions/upload-artifact@v2
     with:
-      name: x265_10bit-${{ inputs.env }}-${{ inputs.config }}
+      name: x265_10bit-${{ runner.os }}-${{ inputs.config }}
       path: dist/x265_10bit.lib

.github/actions/libx265-12/action.yml

@@ -1,7 +1,7 @@
 name: libx265-12
 
 inputs:
-  env:
+  refId:
     type: string
     required: true
   config:
@@ -16,21 +16,12 @@ runs:
     run: |
       git config --global core.autocrlf false
       git config --global core.eol lf
-      git clone -b Release_3.5 https://github.com/videolan/x265.git x265
+      git clone -b ${{ inputs.refId }} https://github.com/videolan/x265.git x265
-  - name: Check cache
-    id: libx26512-cache
-    uses: actions/cache@v3
-    with:
-      path: dist
-      key: libx265-12-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('x265') }}
   - name: Set up MSBuild
-    if: steps.libx26512-cache.outputs.cache-hit != 'true'
     uses: microsoft/setup-msbuild@v1.1
   - name: Set up NASM
-    if: steps.libx26512-cache.outputs.cache-hit != 'true'
     uses: ilammy/setup-nasm@v1.2.1
   - name: Build X265 (12 bit)
-    if: steps.libx26512-cache.outputs.cache-hit != 'true'
     shell: cmd
     env:
       vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
@@ -48,5 +39,5 @@ runs:
   - name: Publish artifact
     uses: actions/upload-artifact@v2
     with:
-      name: x265_12bit-${{ inputs.env }}-${{ inputs.config }}
+      name: x265_12bit-${{ runner.os }}-${{ inputs.config }}
       path: dist/x265_12bit.lib

.github/actions/libx265/action.yml

@@ -1,7 +1,7 @@
 name: libx265
 
 inputs:
-  env:
+  refId:
     type: string
     required: true
   config:
@@ -17,31 +17,20 @@ runs:
       git config --global core.autocrlf false
       git config --global core.eol lf
       git clone -b Release_3.5 https://github.com/videolan/x265.git x265
-  - name: Check cache
-    id: libx265-cache
-    uses: actions/cache@v3
-    with:
-      path: di
-      key: libx265-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('x265') }}
   - name: Set up MSYS2
-    if: steps.libx265-cache.outputs.cache-hit != 'true'
     uses: msys2/setup-msys2@v2
     with:
       install: base-devel binutils autotools automake
       path-type: inherit
   - name: Set up MSBuild
-    if: steps.libx265-cache.outputs.cache-hit != 'true'
     uses: microsoft/setup-msbuild@v1.1
   - name: Set up NASM
-    if: steps.libx265-cache.outputs.cache-hit != 'true'
     uses: ilammy/setup-nasm@v1.2.1
   - name: Set up dependant libs
-    if: steps.libx265-cache.outputs.cache-hit != 'true'
     uses: actions/download-artifact@v3
     with:
       path: build
   - name: Build X265
-    if: steps.libx265-cache.outputs.cache-hit != 'true'
     shell: cmd
     env:
       vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
@@ -59,11 +48,11 @@ runs:
       move ${{ inputs.config }}\x265-static.lib ..\..\..\..\build\
       move x265_config.h ..\..\..\..\dist\include\
       cd ..\..\..\..
-      "${{ env.vsPath }}VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\lib.exe" /ignore:4006 /ignore:4221 /OUT:dist\lib\x265.lib build\x265-static.lib build\x265_10bit-${{ inputs.env }}-${{ inputs.config }}\x265_10bit.lib build\x265_12bit-${{ inputs.env }}-${{ inputs.config }}\x265_12bit.lib
+      "${{ env.vsPath }}VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\lib.exe" /ignore:4006 /ignore:4221 /OUT:dist\lib\x265.lib build\x265-static.lib build\x265_10bit-${{ runner.os }}-${{ inputs.config }}\x265_10bit.lib build\x265_12bit-${{ runner.os }}-${{ inputs.config }}\x265_12bit.lib
       copy x265\source\x265.h dist\include\
       D:\a\_temp\setup-msys2\msys2.cmd -c 'cd dist ; tar czf ../di/libx265.tgz *'
   - name: Publish artifact
     uses: actions/upload-artifact@v2
     with:
-      name: libx265-${{ inputs.env }}-${{ inputs.config }}
+      name: libx265-${{ runner.os }}-${{ inputs.config }}
       path: di/libx265.tgz

.github/actions/libzimg/action.yml

@@ -1,7 +1,7 @@
 name: libzimg
 
 inputs:
-  env:
+  refId:
     type: string
     required: true
   config:
@@ -20,22 +20,14 @@ runs:
     uses: actions/checkout@v3.0.0
     with:
       repository: sekrit-twc/zimg
-      ref: release-3.0.4
+      ref: ${{ inputs.refId }}
       path: zimg
-  - name: Check cache
-    id: libzimg-cache
-    uses: actions/cache@v3
-    with:
-      path: dist
-      key: libzimg-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('zimg') }}
   - name: Set up MSYS2
-    if: steps.libzimg-cache.outputs.cache-hit != 'true'
     uses: msys2/setup-msys2@v2
     with:
       install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
       path-type: inherit
   - name: Build ZIMG
-    if: steps.libzimg-cache.outputs.cache-hit != 'true'
     shell: cmd
     env:
       vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
@@ -48,5 +40,5 @@ runs:
   - name: Publish artifact
     uses: actions/upload-artifact@v2
     with:
-      name: libzimg-${{ inputs.env }}-${{ inputs.config }}
+      name: libzimg-${{ runner.os }}-${{ inputs.config }}
       path: dist/libzimg.tgz

.github/workflows/build.yml

@@ -9,17 +9,15 @@ jobs:
   ffmpeg-static-debug:
     uses: ./.github/workflows/ffmpeg.yml
     with:
-      env: windows-2022
+      system: windows-2022
-      source: ffmpeg
       type: static
       config: debug
-      ffmpegRef: release/5.0
+      ffmpegRef: release/5.1
 
   ffmpeg-static-release:
     uses: ./.github/workflows/ffmpeg.yml
     with:
-      env: windows-2022
+      system: windows-2022
-      source: ffmpeg
       type: static
       config: release
-      ffmpegRef: release/5.0
+      ffmpegRef: release/5.1

.github/workflows/ffmpeg-cartwheel.yml

@@ -0,0 +1,220 @@
+name: 'Build FFmpeg from cartwheel'
+
+on:
+  workflow_dispatch:
+    inputs:
+      system:
+        type: choice
+        required: true
+        default: 'windows-2022' 
+        description: 'System'
+        options: 
+        - windows-2022
+
+      type:
+        type: choice
+        required: true
+        default: 'static' 
+        description: Type
+        options: 
+        - static
+        - shared
+
+      config:
+        type: choice
+        required: true
+        default: 'debug' 
+        description: 'Configuration'
+        options: 
+        - debug
+        - release
+        
+  workflow_call:
+    inputs:
+      system:
+        type: string
+        required: true
+      type:
+        type: string
+        required: true
+      config:
+        type: string
+        required: true
+      ffmpegRef:
+        type: string
+        required: true
+        
+env:
+  vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+  COMPONENTS: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libopus --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libfdk-aac --enable-libvpx "
+  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' }}
+  msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
+
+jobs:
+  libvpl:
+    runs-on: ${{ inputs.system }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ./.github/actions/libvpl
+      with:
+        refId: master
+        config: ${{ inputs.config }}
+
+  liboggvorbis:
+    runs-on: ${{ inputs.system }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ./.github/actions/liboggvorbis
+      with:
+        libogg_refId: v1.3.5
+        libvorbis_refId: v1.3.7
+        config: ${{ inputs.config }}
+               
+  libsvtav1:
+    runs-on: ${{ inputs.system }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ./.github/actions/libsvtav1
+      with:
+        refId: v1.1.0
+        config: ${{ inputs.config }}
+       
+  libsnappy:
+    runs-on: ${{ inputs.system }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ./.github/actions/libsnappy
+      with:
+        refId: 1.1.9
+        config: ${{ inputs.config }}
+
+  libvpx:
+    runs-on: ${{ inputs.system }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ./.github/actions/libvpx
+      with:
+        refId: v1.12.0
+        config: ${{ inputs.config }}
+
+  libmp3lame:
+    runs-on: ${{ inputs.system }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ./.github/actions/libmp3lame
+      with:
+        refId: tags/RELEASE__3_100
+        config: ${{ inputs.config }}
+
+  libzimg:
+    runs-on: ${{ inputs.system }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ./.github/actions/libzimg
+      with:
+        refId: release-3.0.4
+        config: ${{ inputs.config }}
+
+  libopus:
+    runs-on: ${{ inputs.system }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ./.github/actions/libopus
+      with:
+        refId: v1.3.1
+        config: ${{ inputs.config }}
+
+  libfdkaac:
+    runs-on: ${{ inputs.system }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ./.github/actions/libfdkaac
+      with:
+        refId: v2.0.2
+        config: ${{ inputs.config }}
+
+  libx264:
+    runs-on: ${{ inputs.system }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ./.github/actions/libx264
+      with:
+        refId: stable
+        config: ${{ inputs.config }}
+
+  libx265-12:
+    runs-on: ${{ inputs.system }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ./.github/actions/libx265-12
+      with:
+        refId: Release_3.5
+        config: ${{ inputs.config }}
+
+  libx265-10:
+    runs-on: ${{ inputs.system }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ./.github/actions/libx265-10
+      with:
+        refId: Release_3.5
+        config: ${{ inputs.config }}
+
+  libx265:
+    runs-on: ${{ inputs.system }}
+    needs: [libx265-12,libx265-10]
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ./.github/actions/libx265
+      with:
+        refId: Release_3.5
+        config: ${{ inputs.config }}
+
+  cartwheel:
+    runs-on: ${{ inputs.system }}
+    needs: [libvpl,libopus,libsvtav1,libsnappy,libmp3lame,libzimg,liboggvorbis,libx264,libx265,libfdkaac,libvpx]
+    steps:
+    - name: Set up MSYS2
+      uses: msys2/setup-msys2@v2
+      with:
+        install: base-devel binutils mingw-w64-x86_64-cmake nasm
+        path-type: inherit
+    - name: Set up GIT
+      run: |
+        git config --global core.autocrlf false
+        git config --global core.eol lf
+        git config --global user.email "daniel.stankewitz@gmail.com"
+        git config --global user.name "Daniel Stankewitz"
+    - name: Checkout patches
+      uses: actions/checkout@v3.0.0
+    - name: Checkout NvEnc
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: FFmpeg/nv-codec-headers
+        ref: master
+        path: nvenc
+    - name: Checkout AMF
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: GPUOpen-LibrariesAndSDKs/AMF
+        ref: master
+        path: amf
+    - name: Set up artifacts
+      uses: actions/download-artifact@v3
+      with:
+        path: build_artifacts
+    - name: Build FFmpeg from Cartwheel
+      shell: cmd
+      run: |
+        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+        md build dist
+        rem D:\a\_temp\setup-msys2\msys2.cmd -c 'git config --global user.email "daniel.stankewitz@gmail.com" ; git config --global user.name "Daniel Stankewitz" ; git clone https://github.com/intel-media-ci/cartwheel-ffmpeg --recursive cartwheel ; cd cartwheel ; git checkout b3f9843cffd4118e35bb000779444ca2f4196342 ; git submodule update --init --recursive ; cd ffmpeg ; git am ../patches/*.patch ; git apply --ignore-whitespace --verbose ../../0003-dynamic-loading-of-shared-fdk-aac-library-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.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 ../cartwheel/ffmpeg ; PKG_CONFIG_PATH=../../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../../build/include" --extra-ldflags="-LIBPATH:../../build/lib" --prefix=../../build --pkg-config-flags="--static" --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc --disable-shared --enable-static --enable-runtime-cpudetect --disable-devices --disable-demuxers --disable-decoders --disable-network --enable-w32threads --enable-gpl ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ inputs.config }}.tar.gz *'
+        rem D:\a\_temp\setup-msys2\msys2.cmd -c 'git config --global user.email "daniel.stankewitz@gmail.com" ; git config --global user.name "Daniel Stankewitz" ; git clone https://github.com/intel-media-ci/cartwheel-ffmpeg --recursive cartwheel ; cd cartwheel ; git checkout 2757a1d43ca83a3762b24a7ddd74b3291873f89c ; git submodule update --init --recursive ; cd ffmpeg ; git am ../patches/*.patch ; git apply --ignore-whitespace --verbose ../../0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.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 ../cartwheel/ffmpeg ; PKG_CONFIG_PATH=../../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../../build/include" --extra-ldflags="-LIBPATH:../../build/lib" --prefix=../../build --pkg-config-flags="--static" --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc --disable-shared --enable-static --enable-runtime-cpudetect --enable-w32threads --enable-gpl ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ inputs.config }}.tar.gz *'
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'git config --global user.email "daniel.stankewitz@gmail.com" ; git config --global user.name "Daniel Stankewitz" ; git clone https://github.com/intel-media-ci/cartwheel-ffmpeg --recursive cartwheel ; cd cartwheel ; git submodule update --init --recursive ; cd ffmpeg ; git am ../patches/*.patch ; git apply --ignore-whitespace --verbose ../../0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.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 ../cartwheel/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-gpl ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz *'
+    - name: Publish artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: FFmpeg ${{ runner.os }} ${{ inputs.type }} ${{ inputs.config }} package build
+        path: dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz

.github/workflows/ffmpeg.yml

@@ -3,23 +3,14 @@ name: 'Build FFmpeg'
 on:
   workflow_dispatch:
     inputs:
-      env:
+      system:
         type: choice
         required: true
         default: 'windows-2022' 
-        description: 'Environment'
+        description: 'System'
         options: 
         - windows-2022
 
-      source:
-        type: choice
-        required: true
-        default: 'ffmpeg' 
-        description: Source
-        options: 
-        - ffmpeg
-        - cartwheel
-      
       type:
         type: choice
         required: true
@@ -41,15 +32,12 @@ on:
       ffmpegRef:
         type: string
         required: true
-        default: 'release/5.0' 
+        default: 'release/5.1' 
         description: 'FFmpeg refId'
         
   workflow_call:
     inputs:
-      env:
+      system:
-        type: string
-        required: true
-      source:
         type: string
         required: true
       type:
@@ -72,177 +60,128 @@ env:
 
 jobs:
   libvpl:
-    runs-on: ${{ inputs.env }}
+    runs-on: ${{ inputs.system }}
-    if: ${{ inputs.source == 'cartwheel' }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libvpl
       with:
-        env: ${{ inputs.env }}
+        refId: master
         config: ${{ inputs.config }}
 
   liboggvorbis:
-    runs-on: ${{ inputs.env }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/liboggvorbis
       with:
-        env: ${{ inputs.env }}
+        libogg_refId: v1.3.5
+        libvorbis_refId: v1.3.7
         config: ${{ inputs.config }}
                
   libsvtav1:
-    runs-on: ${{ inputs.env }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libsvtav1
       with:
-        env: ${{ inputs.env }}
+        refId: v1.2.0
         config: ${{ inputs.config }}
        
   libsnappy:
-    runs-on: ${{ inputs.env }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libsnappy
       with:
-        env: ${{ inputs.env }}
+        refId: 1.1.9
         config: ${{ inputs.config }}
 
   libvpx:
-    runs-on: ${{ inputs.env }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libvpx
       with:
-        env: ${{ inputs.env }}
+        refId: v1.12.0
         config: ${{ inputs.config }}
 
   libmp3lame:
-    runs-on: ${{ inputs.env }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libmp3lame
       with:
-        env: ${{ inputs.env }}
+        refId: tags/RELEASE__3_100
         config: ${{ inputs.config }}
 
   libzimg:
-    runs-on: ${{ inputs.env }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libzimg
       with:
-        env: ${{ inputs.env }}
+        refId: release-3.0.4
         config: ${{ inputs.config }}
 
   libopus:
-    runs-on: ${{ inputs.env }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libopus
       with:
-        env: ${{ inputs.env }}
+        refId: v1.3.1
         config: ${{ inputs.config }}
 
   libfdkaac:
-    runs-on: ${{ inputs.env }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libfdkaac
       with:
-        env: ${{ inputs.env }}
+        refId: v2.0.2
         config: ${{ inputs.config }}
 
   libx264:
-    runs-on: ${{ inputs.env }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libx264
       with:
-        env: ${{ inputs.env }}
+        refId: stable
         config: ${{ inputs.config }}
 
   libx265-12:
-    runs-on: ${{ inputs.env }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libx265-12
       with:
-        env: ${{ inputs.env }}
+        refId: Release_3.5
         config: ${{ inputs.config }}
 
   libx265-10:
-    runs-on: ${{ inputs.env }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libx265-10
       with:
-        env: ${{ inputs.env }}
+        refId: Release_3.5
         config: ${{ inputs.config }}
 
   libx265:
-    runs-on: ${{ inputs.env }}
+    runs-on: ${{ inputs.system }}
     needs: [libx265-12,libx265-10]
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libx265
       with:
-        env: ${{ inputs.env }}
+        refId: Release_3.5
         config: ${{ inputs.config }}
 
-  cartwheel:
+  ffmpeg:
-    runs-on: ${{ inputs.env }}
+    runs-on: ${{ inputs.system }}
-    if: ${{ inputs.source == 'cartwheel' }}
     needs: [libvpl,libopus,libsvtav1,libsnappy,libmp3lame,libzimg,liboggvorbis,libx264,libx265,libfdkaac,libvpx]
     steps:
-    - name: Set up MSYS2
-      uses: msys2/setup-msys2@v2
-      with:
-        install: base-devel binutils mingw-w64-x86_64-cmake nasm
-        path-type: inherit
-    - name: Set up GIT
-      run: |
-        git config --global core.autocrlf false
-        git config --global core.eol lf
-        git config --global user.email "daniel.stankewitz@gmail.com"
-        git config --global user.name "Daniel Stankewitz"
-    - name: Checkout patches
-      uses: actions/checkout@v3.0.0
-    - name: Checkout NvEnc
-      uses: actions/checkout@v3.0.0
-      with:
-        repository: FFmpeg/nv-codec-headers
-        ref: master
-        path: nvenc
-    - name: Checkout AMF
-      uses: actions/checkout@v3.0.0
-      with:
-        repository: GPUOpen-LibrariesAndSDKs/AMF
-        ref: master
-        path: amf
-    - name: Set up artifacts
-      uses: actions/download-artifact@v3
-      with:
-        path: build_artifacts
-    - name: Build FFmpeg from Cartwheel
-      shell: cmd
-      run: |
-        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
-        md build dist
-        rem D:\a\_temp\setup-msys2\msys2.cmd -c 'git config --global user.email "daniel.stankewitz@gmail.com" ; git config --global user.name "Daniel Stankewitz" ; git clone https://github.com/intel-media-ci/cartwheel-ffmpeg --recursive cartwheel ; cd cartwheel ; git checkout b3f9843cffd4118e35bb000779444ca2f4196342 ; git submodule update --init --recursive ; cd ffmpeg ; git am ../patches/*.patch ; git apply --ignore-whitespace --verbose ../../0003-dynamic-loading-of-shared-fdk-aac-library-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.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 ../cartwheel/ffmpeg ; PKG_CONFIG_PATH=../../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../../build/include" --extra-ldflags="-LIBPATH:../../build/lib" --prefix=../../build --pkg-config-flags="--static" --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc --disable-shared --enable-static --enable-runtime-cpudetect --disable-devices --disable-demuxers --disable-decoders --disable-network --enable-w32threads --enable-gpl ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ inputs.config }}.tar.gz *'
-        rem D:\a\_temp\setup-msys2\msys2.cmd -c 'git config --global user.email "daniel.stankewitz@gmail.com" ; git config --global user.name "Daniel Stankewitz" ; git clone https://github.com/intel-media-ci/cartwheel-ffmpeg --recursive cartwheel ; cd cartwheel ; git checkout 2757a1d43ca83a3762b24a7ddd74b3291873f89c ; cd patches ; git apply --ignore-whitespace ../../hotfix.patch ; cd .. ; git submodule update --init --recursive ; cd ffmpeg ; git am ../patches/*.patch ; git apply --ignore-whitespace --verbose ../../0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.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 ../cartwheel/ffmpeg ; PKG_CONFIG_PATH=../../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../../build/include" --extra-ldflags="-LIBPATH:../../build/lib" --prefix=../../build --pkg-config-flags="--static" --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc --disable-shared --enable-static --enable-runtime-cpudetect --enable-w32threads --enable-gpl ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ inputs.config }}.tar.gz *'
-        D:\a\_temp\setup-msys2\msys2.cmd -c 'git config --global user.email "daniel.stankewitz@gmail.com" ; git config --global user.name "Daniel Stankewitz" ; git clone https://github.com/intel-media-ci/cartwheel-ffmpeg --recursive cartwheel ; cd cartwheel ; cd patches ; git apply --ignore-whitespace ../../hotfix.patch ; cd .. ; git submodule update --init --recursive ; cd ffmpeg ; git am ../patches/*.patch ; git apply --ignore-whitespace --verbose ../../0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.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 ../cartwheel/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-gpl --enable-libvpl ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz *'
-    - name: Publish artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: FFmpeg (Cartwheel) ${{ inputs.env }} ${{ inputs.config }} package build
-        path: dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz
-
-  ffmpeg:
-    runs-on: ${{ inputs.env }}
-    if: ${{ inputs.source == 'ffmpeg' }}  
-    needs: [libopus,libsvtav1,libsnappy,libmp3lame,libzimg,liboggvorbis,libx264,libx265,libfdkaac,libvpx]
-    steps:
     - name: Set up MSYS2
       uses: msys2/setup-msys2@v2
       with:
@@ -257,7 +196,6 @@ jobs:
     - name: Checkout patches
       uses: actions/checkout@v3.0.0
     - name: Checkout FFmpeg
-      if: ${{ inputs.source == 'ffmpeg' }} 
       uses: actions/checkout@v3.0.0
       with:
         repository: FFmpeg/FFmpeg.git
@@ -283,10 +221,10 @@ jobs:
       shell: cmd
       run: |
         call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
-        md build dist
+        md build dist 0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch
-        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --ignore-whitespace --verbose ../0003-dynamic-loading-of-shared-fdk-aac-library-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.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 --pkg-config-flags="--static" --disable-doc ${{ env.variant }} --enable-runtime-cpudetect --disable-devices --disable-demuxers --disable-decoders --disable-network --enable-w32threads --enable-gpl ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz *'
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --ignore-whitespace --verbose ../0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.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-gpl ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz *'
     - name: Publish FFmpeg artifacts
       uses: actions/upload-artifact@v3
       with:
-        name: FFmpeg ${{ inputs.env }} ${{ inputs.config }}${{ inputs.config }} package build
+        name: FFmpeg ${{ inputs.system }} ${{ inputs.config }}${{ inputs.config }} package build
         path: dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz