From d8d0d2e8eb2d45f908fc898eff957f03cd86ba48 Mon Sep 17 00:00:00 2001
From: Daniel Stankewitz <vouk@mailbox.org>
Date: Wed, 23 Mar 2022 19:22:05 +0100
Subject: [PATCH] Update ffmpeg.yml

---
 .github/workflows/ffmpeg.yml | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml
index 7a6eaab..e43ec96 100644
--- a/.github/workflows/ffmpeg.yml
+++ b/.github/workflows/ffmpeg.yml
@@ -431,18 +431,18 @@ jobs:
         repository: FFmpeg/FFmpeg.git
         ref: release/5.0
         path: ffmpeg
-    #- name: Checkout NvEnc
-    #  uses: actions/checkout@v3.0.0
-    #  with:
-    #    repository: FFmpeg/nv-codec-headers
-    #    ref: sdk/9.1
-    #    path: nvenc
-    #- name: Checkout AMF
-    #  uses: actions/checkout@v3.0.0
-    #  with:
-    #    repository: GPUOpen-LibrariesAndSDKs/AMF
-    #    ref: master
-    #    path: amf
+    - name: Checkout NvEnc
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: FFmpeg/nv-codec-headers
+        ref: sdk/9.1
+        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:
@@ -451,11 +451,8 @@ jobs:
       shell: cmd
       run: |
         call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
-        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --ignore-whitespace --verbose ../patches/0003-dynamic-loading-of-shared-fdk-aac-library-5.0.patch ; pwd ; dir'
-        cd
-        dir
         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 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 --disable-shared --enable-static --enable-runtime-cpudetect --disable-devices --disable-demuxers --disable-decoders --disable-network --enable-w32threads --enable-gpl ${{ env.switches }} ; make ; make install ; cd ../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; ls -laR .. ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; ls -laR .. ;  cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ env.msysConfig }}.tar.gz *'
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --ignore-whitespace --verbose ../patches/0003-dynamic-loading-of-shared-fdk-aac-library-5.0.patch ; cd ../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm 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 --disable-shared --enable-static --enable-runtime-cpudetect --disable-devices --disable-demuxers --disable-decoders --disable-network --enable-w32threads --enable-gpl ${{ env.switches }} ; make ; make install ; cd ../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; ls -laR .. ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; ls -laR .. ;  cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ env.msysConfig }}.tar.gz *'
     - name: Publish FFmpeg artifacts
       uses: actions/upload-artifact@v3
       with: