Update ffmpeg-lgpl.yaml

Fixed SV1 build

.github/actions/libfdkaac/action.yml

@@ -0,0 +1,43 @@
+name: libfdkaac
+
+inputs:
+  refId:
+    type: string
+    required: true
+  config:
+    type: string
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+  - name: Set up GIT
+    shell: cmd
+    run: |
+      git config --global core.autocrlf false
+      git config --global core.eol lf
+  - name: Checkout FDK AAC
+    uses: actions/checkout@v3
+    with:
+      repository: mstorsjo/fdk-aac
+      ref: ${{ inputs.refId }}
+      path: fdkaac
+  - name: Set up MSYS2
+    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
+    shell: cmd
+    env:
+      vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+      cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
+    run: |
+      call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+      md build dist
+      D:\a\_temp\setup-msys2\msys2.cmd -c 'cd fdkaac ; autoreconf -fiv ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --disable-shared --disable-static ; make -j 2 ; make install ; cd ../build ; tar czf ../dist/libfdkaac.tgz *'
+  - name: Publish artifact
+    uses: actions/upload-artifact@v2
+    with:
+      name: libfdkaac-${{ runner.os }}-${{ inputs.config }}
+      path: dist/libfdkaac.tgz

.github/actions/libmfx/action.yml

@@ -0,0 +1,18 @@
+name: libmfx
+
+inputs:
+  refId:
+    type: string
+    required: true
+  config:
+    type: string
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+  - name: Publish artifact
+    uses: actions/upload-artifact@v2
+    with:
+      name: libmfx-${{ runner.os }}-${{ inputs.config }}
+      path: .github/actions/libmfx/libmfx.tgz

.github/actions/libmp3lame/action.yml

@@ -0,0 +1,32 @@
+name: libmp3lame
+
+inputs:
+  refId:
+    type: string
+    required: true
+  config:
+    type: string
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+  - name: Set up MSYS2
+    uses: msys2/setup-msys2@v2
+    with:
+      install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm svn
+      path-type: inherit
+  - name: Build LAME
+    shell: cmd
+    env:
+      vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+      cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
+    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/${{ 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-${{ runner.os }}-${{ inputs.config }}
+      path: dist/libmp3lame.tgz

.github/actions/liboggvorbis/action.yml

@@ -0,0 +1,61 @@
+name: liboggvorbis
+
+inputs:
+  libogg_refId:
+    type: string
+    required: true  
+  libvorbis_refId:
+    type: string
+    required: true
+  config:
+    type: string
+    required: true
+  
+runs:
+  using: "composite"
+  steps:
+  - name: Set up GIT
+    shell: cmd
+    run: |
+      git config --global core.autocrlf false
+      git config --global core.eol lf
+  - name: Checkout Ogg
+    uses: actions/checkout@v3
+    with:
+      repository: xiph/ogg
+      ref: ${{ inputs.libogg_refId }}
+      path: ogg
+  - name: Checkout Vorbis
+    uses: actions/checkout@v3.0.0
+    with:
+      repository: xiph/vorbis
+      ref: ${{ inputs.libvorbis_refId }}
+      path: vorbis
+  - name: Set up MSYS2
+    uses: msys2/setup-msys2@v2
+    with:
+      install: base-devel binutils autotools automake
+      path-type: inherit
+  - name: Build Ogg
+    shell: cmd
+    env:
+      vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+      cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
+    run: |
+      call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+      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
+    shell: cmd
+    env:
+      vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+      cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
+    run: |
+      call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+      md dist
+      D:\a\_temp\setup-msys2\msys2.cmd -c 'cd vorbis ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --disable-shared ; make -j ; make install ; sed -i '/^Libs\.private.*/d' ../build/lib/pkgconfig/vorbis.pc ; cd ../build ; tar czf ../dist/liboggvorbis.tgz *'
+  - name: Publish artifact
+    uses: actions/upload-artifact@v2
+    with:
+      name: liboggvorbis-${{ runner.os }}-${{ inputs.config }}
+      path: dist/liboggvorbis.tgz

.github/actions/libopus/action.yml

@@ -0,0 +1,46 @@
+name: libopus
+
+inputs:
+  refId:
+    type: string
+    required: true
+  config:
+    type: string
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+  - name: Set up GIT
+    shell: cmd
+    run: |
+      git config --global core.autocrlf false
+      git config --global core.eol lf
+  - name: Checkout OPUS
+    uses: actions/checkout@v3.0.0
+    with:
+      repository: xiph/opus
+      ref: v1.3.1
+      path: opus        
+  - name: Set up MSYS2
+    uses: msys2/setup-msys2@v2
+    with:
+      install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
+      path-type: inherit
+  - name: Build OPUS
+    shell: cmd
+    env:
+      vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+      cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
+      msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
+    run: |
+      call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+      md build build\include build\lib build\lib\pkgconfig dist
+      cd opus\win32\VS2015
+      MSBuild.exe /property:Configuration="${{ env.msbuildConfig }}" /property:Platform=x64 /property:PlatformToolset=v143 opus.vcxproj
+      D:\a\_temp\setup-msys2\msys2.cmd -c 'cp x64/${{ inputs.config }}/opus.lib ../../../build/lib/opus.lib ; cd ../../.. ; cp -r opus/include build/include/opus ; cp opus/opus.pc.in build/lib/pkgconfig/opus.pc ; sed -i "s#@prefix@#$(realpath ../../../build)#g" build/lib/pkgconfig/opus.pc ; sed -i "s/@exec_prefix@/\$\{prefix\}/g" build/lib/pkgconfig/opus.pc ; sed -i "s/@libdir@/\$\{prefix\}\/lib/g" build/lib/pkgconfig/opus.pc ; sed -i "s/@includedir@/\$\{prefix\}\/include/g" build/lib/pkgconfig/opus.pc ; sed -i "s/@LIBM@//g" build/lib/pkgconfig/opus.pc; sed -i "s/@VERSION@/2.0.0/g" build/lib/pkgconfig/opus.pc ; cd build ; tar czf ../dist/libopus.tgz *'
+  - name: Publish artifact
+    uses: actions/upload-artifact@v2
+    with:
+      name: libopus-${{ runner.os }}-${{ inputs.config }}
+      path: dist/libopus.tgz

.github/actions/libsnappy/action.yml

@@ -0,0 +1,50 @@
+name: libsnappy
+
+inputs:
+  refId:
+    type: string
+    required: true
+  config:
+    type: string
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+  - name: Set up GIT
+    shell: cmd
+    run: |
+      git config --global core.autocrlf false
+      git config --global core.eol lf
+  - name: Checkout Snappy
+    uses: actions/checkout@v3
+    with:
+      repository: google/snappy
+      ref: ${{ inputs.refId }}
+      path: snappy
+  - name: Set up MSYS2
+    uses: msys2/setup-msys2@v2
+    with:
+      install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
+      path-type: inherit
+  - name: Build Snappy
+    shell: cmd
+    env:
+      vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+      cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
+      msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
+    run: |
+      call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+      md build build\include build\lib build\lib\pkgconfig dist
+      cd snappy
+      git submodule update --init
+      md work
+      cd work
+      cmake -G "Visual Studio 17 2022" .. -DCMAKE_INSTALL_PREFIX=..\..\build -DBUILD_SHARED_LIBS=OFF -DSNAPPY_BUILD_TESTS=OFF
+      MSBuild.exe /property:Configuration="${{ env.msbuildConfig }}" Snappy.sln
+      D:\a\_temp\setup-msys2\msys2.cmd -c 'cp ${{ inputs.config }}/snappy.lib ../../build/lib/snappy.lib ; cp ../snappy.h ../snappy-c.h ../../build/include/ ; cd ../../build ; tar czf ../dist/libsnappy.tgz *'
+  - name: Publish artifact
+    uses: actions/upload-artifact@v2
+    with:
+      name: libsnappy-${{ runner.os }}-${{ inputs.config }}
+      path: dist/libsnappy.tgz

.github/actions/libsvtav1/action.yml

@@ -0,0 +1,47 @@
+name: libsvtav1
+
+inputs:
+  refId:
+    type: string
+    required: true
+  config:
+    type: string
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+  - name: Set up GIT
+    shell: cmd
+    run: |
+      git config --global core.autocrlf false
+      git config --global core.eol lf
+      git clone -b ${{ inputs.refId }} https://gitlab.com/AOMediaCodec/SVT-AV1 svtav1
+      cd svtav1
+      git apply --ignore-whitespace --verbose ..\.github\actions\libsvtav1\patches\A01-metadata-copy-segfault-fix.patch
+      cd ..
+  #- name: Checkout SVT AV1
+  #  uses: actions/checkout@v3
+  #  with:
+  #    repository: AOMediaCodec/SVT-AV1
+  #    ref: ${{ inputs.refId }}
+  #    path: svtav1
+  - name: Set up MSYS2
+    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
+    shell: cmd
+    env:
+      vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+      cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
+    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 svtav1/Build/windows ; ./build.bat 2022 ${{ inputs.config }} static ; cp -r ../../Source/API ../../../build/include/svt-av1 ; cp ../../Bin/${{ inputs.config }}/SvtAv1Enc.lib ../../../build/lib/ ; cp SvtAv1Enc.pc ../../../build/lib/pkgconfig/ ; cd ../../../build ; tar czf ../dist/libsvtav1.tgz *'
+  - name: Publish artifact
+    uses: actions/upload-artifact@v2
+    with:
+      name: libsvtav1-${{ runner.os }}-${{ inputs.config }}
+      path: dist/libsvtav1.tgz

.github/actions/libsvtav1/patches/A01-metadata-copy-segfault-fix.patch

@@ -0,0 +1,37 @@
+From 213854249dc8d69653a9f3281cdd4c2063cd3779 Mon Sep 17 00:00:00 2001
+From: Christopher Degawa <christopher.degawa@intel.com>
+Date: Wed, 10 Aug 2022 13:53:17 -0500
+Subject: [PATCH] copy_input_buffer: only copy metadata if a frame was actaully
+ sent
+
+Fixes a segfault if EOS was send through the library without zeroing
+out the metadata array
+
+Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
+---
+ Source/Lib/Encoder/Globals/EbEncHandle.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/Source/Lib/Encoder/Globals/EbEncHandle.c b/Source/Lib/Encoder/Globals/EbEncHandle.c
+index ba5e719a4..fc7a2b1f4 100644
+--- a/Source/Lib/Encoder/Globals/EbEncHandle.c
++++ b/Source/Lib/Encoder/Globals/EbEncHandle.c
+@@ -4814,11 +4814,12 @@ static void copy_input_buffer(SequenceControlSet* scs, EbBufferHeaderType* dst,
+     } else if (pass != ENCODE_FIRST_PASS || copy_frame) {
+         // Bypass copy for the unecessary picture in IPPP pass
+         // Copy the picture buffer
+-        if (src->p_buffer != NULL)
++        if (src->p_buffer != NULL) {
+             copy_frame_buffer(scs, dst->p_buffer, dst_y8b->p_buffer, src->p_buffer, pass);
+-        // Copy the metadata array
+-        if (svt_aom_copy_metadata_buffer(dst, src->metadata) != EB_ErrorNone)
+-            dst->metadata = NULL;
++            // Copy the metadata array
++            if (svt_aom_copy_metadata_buffer(dst, src->metadata) != EB_ErrorNone)
++                dst->metadata = NULL;
++        }
+     }
+ 
+     // Copy the private data list
+-- 
+GitLab

.github/actions/libvpl/action.yml

@@ -0,0 +1,48 @@
+name: libvpl
+
+inputs:
+  refId:
+    type: string
+    required: true
+  config:
+    type: string
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+  - name: Set up GIT
+    shell: cmd
+    run: |
+      git config --global core.autocrlf false
+      git config --global core.eol lf
+  - name: Checkout oneVPL
+    uses: actions/checkout@v3.0.0
+    with:
+      repository: oneapi-src/oneVPL
+      ref: ${{ inputs.refId }}
+      path: onevpl
+  - name: Set up MSYS2
+    uses: msys2/setup-msys2@v2
+    with:
+      install: base-devel binutils autotools automake
+      path-type: inherit
+  - name: Build oneVPL
+    shell: cmd
+    #env:
+     # vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+     # msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
+    run: |
+      call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+      md temp build dist
+      cd temp
+      cmake.exe -G "Visual Studio 17 2022" ..\onevpl -T host=x64 -A x64 -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=..\build -DCMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD=ON
+      MSBuild.exe -t:VPL,INSTALL -p:Configuration=${{ env.msbuildConfig }} -m vpl.sln
+      cd ..\build
+      IF EXIST "lib\vpld.lib" move "lib\vpld.lib" "lib\vpl.lib"
+      D:\a\_temp\setup-msys2\msys2.cmd -c 'rm -rf bin/cmake ; tar czf ../dist/libvpl.tgz *'
+  - name: Publish artifact
+    uses: actions/upload-artifact@v2
+    with:
+      name: libvpl-${{ runner.os }}-${{ inputs.config }}
+      path: dist/libvpl.tgz

.github/actions/libvpx/action.yml

@@ -0,0 +1,38 @@
+name: libvpx
+
+inputs:
+  refId:
+    type: string
+    required: true
+  config:
+    type: string
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+  - name: Set up GIT
+    shell: cmd
+    run: |
+      git config --global core.autocrlf false
+      git config --global core.eol lf
+      git clone --depth 1 -b ${{ inputs.refId }} https://github.com/webmproject/libvpx.git vpx
+  - name: Set up MSYS2
+    uses: msys2/setup-msys2@v2
+    with:
+      install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
+      path-type: inherit
+  - name: Build LibVpx
+    shell: cmd
+    env:
+      vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+      cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
+    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 *'
+  - name: Publish artifact
+    uses: actions/upload-artifact@v2
+    with:
+      name: libvpx-${{ runner.os }}-${{ inputs.config }}
+      path: dist/libvpx.tgz

.github/actions/libx264/action.yml

@@ -0,0 +1,43 @@
+name: libx264
+
+inputs:
+  refId:
+    type: string
+    required: true
+  config:
+    type: string
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+  - name: Set up GIT
+    shell: cmd
+    run: |
+      git config --global core.autocrlf false
+      git config --global core.eol lf
+  - name: Checkout X264
+    uses: actions/checkout@v3
+    with:
+      repository: mirror/x264
+      ref: ${{ inputs.refId }}
+      path: x264
+  - name: Set up MSYS2
+    uses: msys2/setup-msys2@v2
+    with:
+      install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
+      path-type: inherit
+  - name: Build X264
+    shell: cmd
+    env:
+      vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+      cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
+    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 x264 ; CC=cl ./configure --prefix=$(realpath ../build) --disable-cli --enable-static --enable-pic --libdir=../build/lib ; make -j ; make install-lib-static ; cd ../build ; tar czf ../dist/libx264.tgz *'
+  - name: Publish artifact
+    uses: actions/upload-artifact@v2
+    with:
+      name: libx264-${{ runner.os }}-${{ inputs.config }}
+      path: dist/libx264.tgz

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

@@ -0,0 +1,39 @@
+name: libx265-10
+
+inputs:
+  refId:
+    type: string
+    required: true
+  config:
+    type: string
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+  - name: Checkout X265
+    shell: cmd
+    run: |
+      git config --global core.autocrlf false
+      git config --global core.eol lf
+      git clone -b ${{ inputs.refId }} https://github.com/videolan/x265.git x265
+  - name: Set up MSBuild
+    uses: microsoft/setup-msbuild@v1.1
+  - name: Set up NASM
+    uses: ilammy/setup-nasm@v1.2.1
+  - name: Build X265 (10 bit)
+    shell: cmd
+    run: |
+      call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+      md build dist
+      cd x265/build/vc15-x86_64
+      md work
+      cd work
+      cmake -G "Visual Studio 17 2022" ..\..\..\source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF
+      MSBuild.exe /property:Configuration="${{ env.msbuildConfig }}" x265-static.vcxproj
+      move ${{ inputs.config }}\x265-static.lib ..\..\..\..\dist\x265_10bit.lib
+  - name: Publish artifact
+    uses: actions/upload-artifact@v2
+    with:
+      name: x265_10bit-${{ runner.os }}-${{ inputs.config }}
+      path: dist/x265_10bit.lib

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

@@ -0,0 +1,43 @@
+name: libx265-12
+
+inputs:
+  refId:
+    type: string
+    required: true
+  config:
+    type: string
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+  - name: Checkout X265
+    shell: cmd
+    run: |
+      git config --global core.autocrlf false
+      git config --global core.eol lf
+      git clone -b ${{ inputs.refId }} https://github.com/videolan/x265.git x265
+  - name: Set up MSBuild
+    uses: microsoft/setup-msbuild@v1.1
+  - name: Set up NASM
+    uses: ilammy/setup-nasm@v1.2.1
+  - name: Build X265 (12 bit)
+    shell: cmd
+    env:
+      vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+      cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
+      msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
+    run: |
+      call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+      md build dist
+      cd x265/build/vc15-x86_64
+      md work
+      cd work
+      cmake -G "Visual Studio 17 2022" ..\..\..\source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON
+      MSBuild.exe /property:Configuration="${{ env.msbuildConfig }}" x265-static.vcxproj
+      move ${{ inputs.config }}\x265-static.lib ..\..\..\..\dist\x265_12bit.lib
+  - name: Publish artifact
+    uses: actions/upload-artifact@v2
+    with:
+      name: x265_12bit-${{ runner.os }}-${{ inputs.config }}
+      path: dist/x265_12bit.lib

.github/actions/libx265/action.yml

@@ -0,0 +1,58 @@
+name: libx265
+
+inputs:
+  refId:
+    type: string
+    required: true
+  config:
+    type: string
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+  - name: Checkout X265
+    shell: cmd
+    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
+  - name: Set up MSYS2
+    uses: msys2/setup-msys2@v2
+    with:
+      install: base-devel binutils autotools automake
+      path-type: inherit
+  - name: Set up MSBuild
+    uses: microsoft/setup-msbuild@v1.1
+  - name: Set up NASM
+    uses: ilammy/setup-nasm@v1.2.1
+  - name: Set up dependant libs
+    uses: actions/download-artifact@v3
+    with:
+      path: build
+  - name: Build X265
+    shell: cmd
+    env:
+      vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+      cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
+      msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
+    run: |
+      call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+      md di dist dist\include dist\lib dist\lib\pkgconfig
+      cd x265/build/vc15-x86_64
+      md work
+      cd work
+      cmake -G "Visual Studio 17 2022" ..\..\..\source -DCMAKE_INSTALL_PREFIX=..\..\..\..\build -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DEXTRA_LIB="libx265_10bit.lib;libx265_12bit.lib" -DLINKED_10BIT=ON -DLINKED_12BIT=ON
+      MSBuild.exe /property:Configuration="${{ env.msbuildConfig }}" x265-static.vcxproj
+      cp x265.pc ..\..\..\..\dist\lib\pkgconfig\x265.pc
+      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-${{ 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-${{ runner.os }}-${{ inputs.config }}
+      path: di/libx265.tgz

.github/actions/libzimg/action.yml

@@ -0,0 +1,44 @@
+name: libzimg
+
+inputs:
+  refId:
+    type: string
+    required: true
+  config:
+    type: string
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+  - name: Set up GIT
+    shell: cmd
+    run: |
+      git config --global core.autocrlf false
+      git config --global core.eol lf
+  - name: Checkout ZIMG
+    uses: actions/checkout@v3.0.0
+    with:
+      repository: sekrit-twc/zimg
+      ref: ${{ inputs.refId }}
+      path: zimg
+  - name: Set up MSYS2
+    uses: msys2/setup-msys2@v2
+    with:
+      install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
+      path-type: inherit
+  - name: Build ZIMG
+    shell: cmd
+    env:
+      vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+      cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
+      msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
+    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 zimg ; ./autogen.sh ; ./configure --prefix=$(realpath ../build) ; cd _msvc/zimg ; MSBuild.exe /property:Configuration="${{ env.msbuildConfig }}" /property:ConfigurationType=StaticLibrary /property:PlatformToolset=v143 /property:Platform=x64 /property:WholeProgramOptimization=false zimg.vcxproj ; cp x64/${{ inputs.config }}/z.lib ../../../build/lib/zimg.lib ; cd ../.. ; cp src/zimg/api/zimg.h  ../build/include/zimg.h ; cp zimg.pc ../build/lib/pkgconfig/zimg.pc ; cd ../build ; tar czf ../dist/libzimg.tgz *'
+  - name: Publish artifact
+    uses: actions/upload-artifact@v2
+    with:
+      name: libzimg-${{ runner.os }}-${{ inputs.config }}
+      path: dist/libzimg.tgz

.github/workflows/build.yml

@@ -0,0 +1,23 @@
+name: Build all
+
+on:
+  workflow_dispatch:
+#  schedule:
+#  - cron: "0 1 * * *"
+
+jobs:
+  ffmpeg-static-debug:
+    uses: ./.github/workflows/ffmpeg.yml
+    with:
+      system: windows-2022
+      type: static
+      config: debug
+      ffmpegRef: release/5.1
+
+  ffmpeg-static-release:
+    uses: ./.github/workflows/ffmpeg.yml
+    with:
+      system: windows-2022
+      type: static
+      config: release
+      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 ../../libfdkaac-dynlib-5.1.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-lgpl.yaml

@@ -0,0 +1,186 @@
+name: 'Build FFmpeg (LGPL)'
+
+on:
+  workflow_dispatch:
+    inputs:
+      system:
+        type: choice
+        required: true
+        default: 'windows-2022' 
+        description: 'System'
+        options: 
+        - windows-2022
+
+      type:
+        type: choice
+        required: true
+        default: 'shared' 
+        description: Type
+        options: 
+        - static
+        - shared
+
+      config:
+        type: choice
+        required: true
+        default: 'release' 
+        description: 'Configuration'
+        options: 
+        - debug
+        - release
+        
+      ffmpegRef:
+        type: string
+        required: true
+        default: 'master' 
+        description: 'FFmpeg refId'
+        
+  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-libvpx --enable-libopus "
+  #--enable-libvorbis
+  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 --build-suffix=-voukoderpro' }}
+  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.4.1
+        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.13.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 }}
+
+  ffmpeg:
+    runs-on: ${{ inputs.system }}
+    needs: [libvpl,libsvtav1,libsnappy,libvpx,libmp3lame,libzimg,libopus]
+    #liboggvorbis
+    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 FFmpeg
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: FFmpeg/FFmpeg.git
+        ref: ${{ inputs.ffmpegRef }} 
+        path: ffmpeg
+    - 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
+      shell: cmd
+      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 *'
+    - name: Publish FFmpeg artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: FFmpeg ${{ inputs.system }} ${{ inputs.config }}${{ inputs.config }} package build
+        path: dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz

.github/workflows/ffmpeg.yml

@@ -0,0 +1,230 @@
+name: 'Build FFmpeg (GPL)'
+
+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: 'release' 
+        description: 'Configuration'
+        options: 
+        - debug
+        - release
+        
+      ffmpegRef:
+        type: string
+        required: true
+        default: 'release/6.0' 
+        description: 'FFmpeg refId'
+        
+  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-libvpx --enable-libvorbis --enable-libopus --enable-libx264 --enable-libx265 "
+  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.4.1
+        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.13.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 }}
+
+  ffmpeg:
+    runs-on: ${{ inputs.system }}
+    needs: [libvpl,libsvtav1,libsnappy,libvpx,libmp3lame,libzimg,liboggvorbis,libopus,libfdkaac,libx264,libx265]
+    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 FFmpeg
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: FFmpeg/FFmpeg.git
+        ref: ${{ inputs.ffmpegRef }} 
+        path: ffmpeg
+    - 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
+      shell: cmd
+      run: |
+        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+        md build dist
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --ignore-whitespace ../libfdkaac.patch ; 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.system }} ${{ inputs.config }}${{ inputs.config }} package build
+        path: dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz

.github/workflows/test.yml

@@ -0,0 +1,111 @@
+name: 'Test'
+
+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: 'release' 
+        description: 'Configuration'
+        options: 
+        - debug
+        - release
+        
+      ffmpegRef:
+        type: string
+        required: true
+        default: 'release/5.1' 
+        description: 'FFmpeg refId'
+        
+  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: " "
+  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:
+  ffmpeg:
+    runs-on: ${{ inputs.system }}
+    needs: []
+    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 FFmpeg
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: FFmpeg/FFmpeg.git
+        ref: ${{ inputs.ffmpegRef }} 
+        path: ffmpeg
+    - 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
+      shell: cmd
+      run: |
+        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+        md build dist
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --ignore-whitespace ../amd-av1-amf.patch ; git apply --ignore-whitespace ../nvidia-av1-nvenc.patch ; git apply --ignore-whitespace --verbose ../libfdkaac-dynlib-5.1.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.system }} ${{ inputs.config }}${{ inputs.config }} package build
+        path: dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz

README.md

@@ -1,23 +1,3 @@
-# voukoder-ffmpeg-buildscript
+# voukoder-ffmpeg
 
-Builds static libraries of ffmeg and external libraries (x264 8bit, x265 8,10 and 12bit) to be used in the voukoder project.
-
-## Install msys2
-- Get the 64bit version of msys2 from msys2.org
-- Install it
-
-## Start msys2
-- Open a command prompt
-- Run "vcvarsall.bat amd64" in "c:\program files (x86)\microsoft visual studio\2017\community\VC\Auxiliary\Build"
-- Run msys2 with "msys2_shell.cmd -mingw64 -full-path"
-
-## Install development tools
-- Install CMakeGui in Windows to have the VisualStudio templates ready
-- Install "pacman -S base-devel binutils git make pkg-config" in msys2
-- Install nasm to /usr/bin/nasm.exe
-- Install cmake gui
-- Add cmake path to path variable
-
-## Starting the build
-- Have the build.sh file at i.e. "/home/daniel/ffmpeg/build.sh"
-- Start the build by either "./build.sh debug" or "./build.sh release"
+Provides a FFmpeg static libs to be used with Voukoder. They are being built using a GitHub action worflow.

build_tc.sh

@@ -1,185 +0,0 @@
-#!/bin/bash
-
-STEP=$1
-MODE=$2
-CPU_CORES=$3
-ENABLED_TOOLS=$4
-SRC=`realpath src`
-BUILD=`realpath build`
-
-if [ "$MODE" == "debug" ]; then
-  MSBUILD_CONFIG=Debug
-elif [ "$MODE" == "release" ]; then
-  MSBUILD_CONFIG=Release
-else
-  echo "Please supply build mode [debug|release]!"
-  exit 1
-fi
-
-if [ ! -d "$BUILD" ]; then
-  mkdir $BUILD $BUILD/include $BUILD/lib
-fi
-
-function compile {
-  cd $SRC/$1
-  if [ -f autogen.sh ]; then
-    ./autogen.sh
-  fi
-  CC=cl ./configure --prefix=$BUILD $2
-  make -j $CPU_CORES
-  make install
-}
-
-if [ "$STEP" == "opus" ]; then
-  cd $SRC/opus/win32/VS2015
-  echo \nConverting project file ...
-  sed -i 's/v140/v141/g' opus.vcxproj
-  echo Building project 'opus' ...
-  MSBuild.exe /maxcpucount:$CPU_CORES /property:Configuration="$MSBUILD_CONFIG" /property:Platform=x64 opus.vcxproj
-  echo Done.
-  cp x64/$MSBUILD_CONFIG/opus.lib $BUILD/lib/opus.lib
-  cp -r $SRC/opus/include $BUILD/include/opus
-  cp $SRC/opus/opus.pc.in $BUILD/lib/pkgconfig/opus.pc
-  sed -i "s#@prefix@#$BUILD#g" $BUILD/lib/pkgconfig/opus.pc
-  sed -i "s/@exec_prefix@/\$\{prefix\}/g" $BUILD/lib/pkgconfig/opus.pc
-  sed -i "s/@libdir@/\$\{prefix\}\/lib/g" $BUILD/lib/pkgconfig/opus.pc
-  sed -i "s/@includedir@/\$\{prefix\}\/include/g" $BUILD/lib/pkgconfig/opus.pc
-  sed -i "s/@LIBM@//g" $BUILD/lib/pkgconfig/opus.pc
-  sed -i "s/@VERSION@/2.0.0/g" $BUILD/lib/pkgconfig/opus.pc
-elif [ "$STEP" == "libfdk-aac" ]; then
-  compile fdk-aac "--disable-static --disable-shared"
-elif [ "$STEP" == "lame" ]; then
-  compile lame "--enable-nasm --disable-frontend --disable-shared --enable-static"
-elif [ "$STEP" == "zimg" ]; then
-  cd $SRC/zimg
-  ./autogen.sh
-  ./configure --prefix=$BUILD
-  cd _msvc/zimg
-  MSBuild.exe /maxcpucount:$CPU_CORES /property:Configuration="$MSBUILD_CONFIG" /property:Platform=x64 /property:WholeProgramOptimization=false zimg.vcxproj
-  cp x64/$MSBUILD_CONFIG/z.lib $BUILD/lib/zimg.lib
-  cd ../..
-  cp src/zimg/api/zimg.h  $BUILD/include/zimg.h
-  cp zimg.pc $BUILD/lib/pkgconfig/zimg.pc
-elif [ "$STEP" == "x264" ]; then
-  cd $SRC/x264
-  CC=cl ./configure --prefix=$BUILD --extra-cflags='-DNO_PREFIX' --disable-cli --enable-static --libdir=$BUILD/lib
-  make -j $CPU_CORES
-  make install-lib-static
-elif [ "$STEP" == "x265" ]; then
-  # checkout manually (cmake is getting values from git)
-  cd $src/..
-  if [ ! -d $SRC/x265/.git ]; then
-    git clone https://github.com/videolan/x265.git --branch stable $SRC/x265
-  fi
-  git reset --hard
-  git pull
-  cd $SRC/x265/build/vc15-x86_64
-  rm -rf work*
-  mkdir work work10 work12
-  # 12bit
-  cd work12
-  cmake -G "Visual Studio 15 Win64" ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON
-  MSBuild.exe /maxcpucount:$CPU_CORES /property:Configuration="$MSBUILD_CONFIG" x265-static.vcxproj
-  cp $MSBUILD_CONFIG/x265-static.lib ../work/x265_12bit.lib
-  # 10bit
-  cd ../work10
-  cmake -G "Visual Studio 15 Win64" ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF
-  MSBuild.exe /maxcpucount:$CPU_CORES /property:Configuration="$MSBUILD_CONFIG" x265-static.vcxproj
-  cp $MSBUILD_CONFIG/x265-static.lib ../work/x265_10bit.lib
-  # 8bit - main
-  cd ../work
-  cmake -G "Visual Studio 15 Win64" ../../../source -DCMAKE_INSTALL_PREFIX=$BUILD -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DEXTRA_LIB="x265_10bit.lib;x265_12bit.lib" -DLINKED_10BIT=ON -DLINKED_12BIT=ON
-  #-DSTATIC_LINK_CRT=ON
-  MSBuild.exe /maxcpucount:$CPU_CORES /property:Configuration="$MSBUILD_CONFIG" x265-static.vcxproj
-  cp $MSBUILD_CONFIG/x265-static.lib ./x265_main.lib
-  LIB.EXE /ignore:4006 /ignore:4221 /OUT:x265.lib x265_main.lib x265_10bit.lib x265_12bit.lib
-  cp x265.lib $BUILD/lib/x265.lib
-  cp x265.pc $BUILD/lib/pkgconfig/x265.pc
-  cp x265_config.h $BUILD/include/
-  cp ../../../source/x265.h $BUILD/include/
-elif [ "$STEP" == "libogg" ]; then
-  compile libogg "--disable-shared"
-elif [ "$STEP" == "libvorbis" ]; then
-  compile libvorbis "--disable-shared"  
-  sed -i '/^Libs\.private.*/d' $BUILD/lib/pkgconfig/vorbis.pc  # don't need m.lib on windows
-elif [ "$STEP" == "libvpx" ]; then
-  cd $SRC/libvpx
-  ./configure --prefix=$BUILD --target=x86_64-win64-vs15 --enable-vp9-highbitdepth --disable-shared --disable-examples --disable-tools --disable-docs --disable-libyuv --disable-unit_tests --disable-postproc
-  make -j $CPU_CORES
-  make install
-  mv $BUILD/lib/x64/vpxmd.lib $BUILD/lib/vpx.lib
-  rm -rf $BUILD/lib/x64
-elif [ "$STEP" == "snappy" ]; then
-  cd $SRC/snappy
-  rm -rf work
-  mkdir work
-  cd work
-  cmake -G "Visual Studio 15 Win64" .. -DCMAKE_INSTALL_PREFIX=$BUILD -DBUILD_SHARED_LIBS=OFF -DSNAPPY_BUILD_TESTS=OFF
-  MSBuild.exe /maxcpucount:$CPU_CORES /property:Configuration="$MSBUILD_CONFIG" Snappy.sln
-  cp $MSBUILD_CONFIG/snappy.lib $BUILD/lib/snappy.lib
-  cp ../snappy.h ../snappy-c.h $BUILD/include/
-elif [ "$STEP" == "libaom" ]; then
-  cd $SRC/libaom
-  rm -rf work
-  mkdir work
-  cd work
-  cmake -G "Visual Studio 15 Win64" .. -DENABLE_{DOCS,TOOLS,TESTS}=off -DAOM_TARGET_CPU=x86_64 -DCMAKE_INSTALL_PREFIX=$BUILD
-  MSBuild.exe /maxcpucount:$CPU_CORES /property:Configuration="$MSBUILD_CONFIG" AOM.sln
-  cp $MSBUILD_CONFIG/aom.lib $BUILD/lib/aom.lib
-  cp -r ../aom $BUILD/include/aom
-  cmake -DAOM_CONFIG_DIR=. -DAOM_ROOT=.. -DCMAKE_INSTALL_PREFIX=@prefix@ -DCMAKE_PROJECT_NAME=aom -DCONFIG_MULTITHREAD=true -DHAVE_PTHREAD_H=false -P "../build/cmake/pkg_config.cmake"
-  sed -i "s#@prefix@#$BUILD#g" aom.pc
-  sed -i '/^Libs\.private.*/d' aom.pc
-  sed -i 's/-lm//' aom.pc
-  cp aom.pc $BUILD/lib/pkgconfig/aom.pc
-  
-elif [ "$STEP" == "ffmpeg" ]; then
-  echo "### Copying NVENC headers ..."
-  cd $SRC/ffnvcodec
-  make PREFIX=$BUILD install
-  
-  echo "### Copying AMF headers ..."
-  cp -a $SRC/amf/amf/public/include $BUILD/include/AMF
-  
-  echo "### Applying patches ..."
-  cd $SRC/ffmpeg
-  
-  ffbranch=$(git rev-parse --abbrev-ref HEAD)
-  echo "FFMpeg branch: $ffbranch ..."
-  if [ "$ffbranch" == "release/4.0" ]; then
-    patch -N -p1 -i ../../patches/0001-dynamic-loading-of-shared-fdk-aac-library-4.0.patch
-    patch -N -p0 -i ../../patches/0002-patch-ffmpeg-to-new-fdk-api.patch
-  else  
-    patch -N -p1 -i ../../patches/0001-dynamic-loading-of-shared-fdk-aac-library.patch
-  fi
-  
-  echo "### Compiling FFMpeg ..."
-  cd $SRC/ffmpeg
-  if [ "$MODE" == "debug" ]; then
-    CFLAGS=-MDd
-  elif [ "$MODE" == "release" ]; then
-    CFLAGS=-MD
-  fi
-  PKG_CONFIG_PATH=$BUILD/lib/pkgconfig:$PKG_CONFIG_PATH ./configure --toolchain=msvc --extra-cflags="$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-network --enable-w32threads $ENABLED_TOOLS
-  make -j $CPU_CORES
-  make install
-  
-  # rename *.a to *.lib
-  cd $BUILD/lib
-  for file in *.a; do
-    mv "$file" "`basename "$file" .a`.lib"
-  done
-
-  # clean up
-  rm -rf $BUILD/lib/pkgconfig $BUILD/lib/fdk-aac.lib $BUILD/lib/*.la
-  
-  # Create archives
-  cd $BUILD
-  mkdir ../dist 2>/dev/null
-  tar czf ../dist/ffmpeg-win64-static-$MODE.tar.gz *
-  cd $SRC/ffmpeg
-  tar czf ../../dist/ffmpeg-win64-static-src-$MODE.tar.gz *
-else
-  echo "Unknown build step!"
-  exit 1
-fi

libfdkaac.patch

@@ -1,38 +1,25 @@
-From 099b9eaee7cc6dae0ace4d8ce83cbb65449eb901 Mon Sep 17 00:00:00 2001
-From: sherpya <sherpya@netfarm.it>
-Date: Sun, 4 Dec 2016 01:28:51 +0100
-Subject: [PATCH 1/6] dynamic loading of shared fdk-aac library
-
----
- configure                        |  6 +--
- libavcodec/libfdk-aac_internal.h | 84 ++++++++++++++++++++++++++++++++
- libavcodec/libfdk-aacdec.c       | 32 ++++++++++--
- libavcodec/libfdk-aacenc.c       | 25 +++++++++-
- 4 files changed, 138 insertions(+), 9 deletions(-)
- create mode 100644 libavcodec/libfdk-aac_internal.h
-
 diff --git a/configure b/configure
-index 25120337de..36e8d99f00 100755
+index b6616f00b6..d02f5099fe 100755
 --- a/configure
 +++ b/configure
-@@ -1675,7 +1675,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
+@@ -1774,7 +1774,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
+ 
  EXTERNAL_LIBRARY_NONFREE_LIST="
      decklink
-     libndi_newtek
 -    libfdk_aac
-     openssl
      libtls
  "
-@@ -1713,6 +1712,7 @@ EXTERNAL_LIBRARY_LIST="
-     libcelt
-     libcodec2
-     libdc1394
+ 
+@@ -1873,6 +1872,7 @@ EXTERNAL_LIBRARY_LIST="
+     openssl
+     pocketsphinx
+     vapoursynth
 +    libfdk_aac
-     libdrm
-     libflite
-     libfontconfig
-@@ -6064,9 +6064,7 @@ enabled libcodec2         && require libcodec2 codec2/codec2.h codec2_create -lc
- enabled libdavs2          && require_pkg_config libdavs2 "davs2 >= 1.5.115" davs2.h davs2_decoder_open
+ "
+ 
+ HWACCEL_AUTODETECT_LIBRARY_LIST="
+@@ -6581,9 +6581,7 @@ enabled libdav1d          && require_pkg_config libdav1d "dav1d >= 0.5.0" "dav1d
+ enabled libdavs2          && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open
  enabled libdc1394         && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new
  enabled libdrm            && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion
 -enabled libfdk_aac        && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen ||
@@ -44,7 +31,7 @@ index 25120337de..36e8d99f00 100755
  enabled fontconfig        && enable libfontconfig
 diff --git a/libavcodec/libfdk-aac_internal.h b/libavcodec/libfdk-aac_internal.h
 new file mode 100644
-index 0000000000..cd1e6e3340
+index 0000000000..9bcfdb9aba
 --- /dev/null
 +++ b/libavcodec/libfdk-aac_internal.h
 @@ -0,0 +1,84 @@
@@ -132,28 +119,29 @@ index 0000000000..cd1e6e3340
 +} aacDecLib;
 +
 +#endif /* AVCODEC_LIBFDK_AAC_INTERNAL_H */
+\ No newline at end of file
 diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c
-index 1abe1d8438..ef7728c368 100644
+index 8c1586e25e..25f68cdd10 100644
 --- a/libavcodec/libfdk-aacdec.c
 +++ b/libavcodec/libfdk-aacdec.c
-@@ -24,6 +24,7 @@
- #include "libavutil/opt.h"
+@@ -25,6 +25,7 @@
  #include "avcodec.h"
- #include "internal.h"
+ #include "codec_internal.h"
+ #include "decode.h"
 +#include "libfdk-aac_internal.h"
  
  #ifdef AACDECODER_LIB_VL0
  #define FDKDEC_VER_AT_LEAST(vl0, vl1) \
-@@ -47,6 +48,8 @@ enum ConcealMethod {
+@@ -48,6 +49,8 @@ enum ConcealMethod {
  typedef struct FDKAACDecContext {
      const AVClass *class;
      HANDLE_AACDECODER handle;
-+    void *hLib;
++	void *hLib;
 +    aacDecLib pfn;
      uint8_t *decoder_buffer;
      int decoder_buffer_size;
      uint8_t *anc_buffer;
-@@ -99,7 +102,7 @@ static const AVClass fdk_aac_dec_class = {
+@@ -113,7 +116,7 @@ static const AVClass fdk_aac_dec_class = {
  static int get_stream_info(AVCodecContext *avctx)
  {
      FDKAACDecContext *s   = avctx->priv_data;
@@ -162,7 +150,7 @@ index 1abe1d8438..ef7728c368 100644
      int channel_counts[0x24] = { 0 };
      int i, ch_error       = 0;
      uint64_t ch_layout    = 0;
-@@ -211,8 +214,10 @@ static av_cold int fdk_aac_decode_close(AVCodecContext *avctx)
+@@ -231,8 +234,10 @@ static av_cold int fdk_aac_decode_close(AVCodecContext *avctx)
  {
      FDKAACDecContext *s = avctx->priv_data;
  
@@ -175,57 +163,56 @@ index 1abe1d8438..ef7728c368 100644
      av_freep(&s->decoder_buffer);
      av_freep(&s->anc_buffer);
  
-@@ -224,6 +229,27 @@ static av_cold int fdk_aac_decode_init(AVCodecContext *avctx)
+@@ -244,6 +249,27 @@ static av_cold int fdk_aac_decode_init(AVCodecContext *avctx)
      FDKAACDecContext *s = avctx->priv_data;
      AAC_DECODER_ERROR err;
  
-+    if (!(s->hLib = dlopen(LIBNAME, RTLD_NOW))) {
-+        av_log(avctx, AV_LOG_ERROR, "Unable to load " LIBNAME "\n");
-+        return -1;
-+    }
++	if (!(s->hLib = dlopen(LIBNAME, RTLD_NOW))) {
++		av_log(avctx, AV_LOG_ERROR, "Unable to load " LIBNAME "\n");
++		return -1;
++	}
 +
-+    DLSYM(aacDecoder_Open);
++	DLSYM(aacDecoder_Open);
 +#define aacDecoder_Open s->pfn.aacDecoder_Open
-+    DLSYM(aacDecoder_Close);
-+    DLSYM(aacDecoder_Fill);
++	DLSYM(aacDecoder_Close);
++	DLSYM(aacDecoder_Fill);
 +#define aacDecoder_Fill s->pfn.aacDecoder_Fill
-+    DLSYM(aacDecoder_DecodeFrame);
++	DLSYM(aacDecoder_DecodeFrame);
 +#define aacDecoder_DecodeFrame s->pfn.aacDecoder_DecodeFrame
-+    DLSYM(aacDecoder_GetStreamInfo);
++	DLSYM(aacDecoder_GetStreamInfo);
 +#define aacDecoder_GetStreamInfo s->pfn.aacDecoder_GetStreamInfo
-+    DLSYM(aacDecoder_ConfigRaw);
++	DLSYM(aacDecoder_ConfigRaw);
 +#define aacDecoder_ConfigRaw s->pfn.aacDecoder_ConfigRaw
-+    DLSYM(aacDecoder_SetParam);
++	DLSYM(aacDecoder_SetParam);
 +#define aacDecoder_SetParam s->pfn.aacDecoder_SetParam
-+    DLSYM(aacDecoder_AncDataInit);
++	DLSYM(aacDecoder_AncDataInit);
 +#define aacDecoder_AncDataInit s->pfn.aacDecoder_AncDataInit
 +
      s->handle = aacDecoder_Open(avctx->extradata_size ? TT_MP4_RAW : TT_MP4_ADTS, 1);
      if (!s->handle) {
          av_log(avctx, AV_LOG_ERROR, "Error opening decoder\n");
 diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
-index 5620bb5951..c4519b6b74 100644
+index 54549de473..9e93ce092c 100644
 --- a/libavcodec/libfdk-aacenc.c
 +++ b/libavcodec/libfdk-aacenc.c
-@@ -26,6 +26,8 @@
- #include "audio_frame_queue.h"
- #include "internal.h"
- 
+@@ -27,6 +27,7 @@
+ #include "codec_internal.h"
+ #include "encode.h"
+ #include "profiles.h"
 +#include "libfdk-aac_internal.h"
-+
+ 
  #ifdef AACENCODER_LIB_VL0
  #define FDKENC_VER_AT_LEAST(vl0, vl1) \
-     ((AACENCODER_LIB_VL0 > vl0) || \
-@@ -45,6 +47,8 @@ typedef struct AACContext {
+@@ -46,6 +47,8 @@ typedef struct AACContext {
+     int latm;
      int header_period;
      int vbr;
++	void *hLib;
++	aacEncLib pfn;
  
-+    void *hLib;
-+    aacEncLib pfn;
      AudioFrameQueue afq;
  } AACContext;
- 
-@@ -108,8 +112,10 @@ static int aac_encode_close(AVCodecContext *avctx)
+@@ -111,8 +114,10 @@ static int aac_encode_close(AVCodecContext *avctx)
  {
      AACContext *s = avctx->priv_data;
  
@@ -235,14 +222,14 @@ index 5620bb5951..c4519b6b74 100644
 +        s->pfn.aacEncClose(&s->handle);
 +        dlclose(s->hLib);
 +    }
-     av_freep(&avctx->extradata);
      ff_af_queue_close(&s->afq);
  
-@@ -126,6 +132,21 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
+     return 0;
+@@ -128,6 +133,21 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
      int aot = FF_PROFILE_AAC_LOW + 1;
      int sce = 0, cpe = 0;
  
-+    if (!(s->hLib = dlopen(LIBNAME, RTLD_NOW))) {
++	if (!(s->hLib = dlopen(LIBNAME, RTLD_NOW))) {
 +        av_log(avctx, AV_LOG_ERROR, "Unable to load " LIBNAME "\n");
 +        return -1;
 +    }
@@ -257,8 +244,6 @@ index 5620bb5951..c4519b6b74 100644
 +    DLSYM(aacEncoder_SetParam);
 +#define aacEncoder_SetParam s->pfn.aacEncoder_SetParam
 +
-     if ((err = aacEncOpen(&s->handle, 0, avctx->channels)) != AACENC_OK) {
+     if ((err = aacEncOpen(&s->handle, 0, avctx->ch_layout.nb_channels)) != AACENC_OK) {
          av_log(avctx, AV_LOG_ERROR, "Unable to open the encoder: %s\n",
                 aac_get_error(err));
--- 
-2.19.0

patches/0001-dynamic-loading-of-shared-fdk-aac-library-4.0.patch

@@ -1,261 +0,0 @@
-From 3429a813b77a7658d2ee59be7c9228e306d86d14 Mon Sep 17 00:00:00 2001
-From: sherpya <sherpya@netfarm.it>
-Date: Sun, 4 Dec 2016 01:28:51 +0100
-Subject: [PATCH 1/6] dynamic loading of shared fdk-aac library
-
----
- configure                  |  6 ++--
- libavcodec/libfdk-aacdec.c | 73 ++++++++++++++++++++++++++++++++++++++++++++--
- libavcodec/libfdk-aacenc.c | 59 +++++++++++++++++++++++++++++++++++--
- 3 files changed, 129 insertions(+), 9 deletions(-)
-
-diff --git a/configure b/configure
-index 0b01a221c7..9dae091033 100755
---- a/configure
-+++ b/configure
-@@ -1563,7 +1563,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
- EXTERNAL_LIBRARY_NONFREE_LIST="
-     decklink
-     libndi_newtek
--    libfdk_aac
-     openssl
-     libtls
- "
-@@ -1597,6 +1596,7 @@ EXTERNAL_LIBRARY_LIST="
-     libcaca
-     libcelt
-     libdc1394
-+    libfdk_aac
-     libdrm
-     libflite
-     libfontconfig
-@@ -5841,9 +5841,7 @@ enabled libcelt           && require libcelt celt/celt.h celt_decode -lcelt0 &&
- enabled libcaca           && require_pkg_config libcaca caca caca.h caca_create_canvas
- enabled libdc1394         && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new
- enabled libdrm            && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion
--enabled libfdk_aac        && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen ||
--                               { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac &&
--                                 warn "using libfdk without pkg-config"; } }
-+enabled libfdk_aac        && { check_header fdk-aac/aacenc_lib.h || die "ERROR: aacenc_lib.h not found"; }
- flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
- enabled libflite          && require libflite "flite/flite.h" flite_init $flite_extralibs
- enabled fontconfig        && enable libfontconfig
-diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c
-index 677b11088b..d191133ae0 100644
---- a/libavcodec/libfdk-aacdec.c
-+++ b/libavcodec/libfdk-aacdec.c
-@@ -17,6 +17,17 @@
-  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
- 
-+#ifndef _WIN32
-+#include <dlfcn.h>
-+#define LIBNAME "libfdk-aac.so.1"
-+#else
-+#include <windows.h>
-+#define LIBNAME "libfdk-aac-1.dll"
-+#define dlopen(fname, f) ((void *) LoadLibraryA(fname))
-+#define dlclose(handle) FreeLibrary((HMODULE) handle)
-+#define dlsym(handle, name) GetProcAddress((HMODULE) handle, name)
-+#endif
-+
- #include <fdk-aac/aacdecoder_lib.h>
- 
- #include "libavutil/channel_layout.h"
-@@ -25,6 +36,37 @@
- #include "avcodec.h"
- #include "internal.h"
- 
-+typedef LINKSPEC_H HANDLE_AACDECODER (*imp_aacDecoder_Open)(TRANSPORT_TYPE transportFmt, UINT nrOfLayers);
-+typedef LINKSPEC_H void (*imp_aacDecoder_Close)(HANDLE_AACDECODER self);
-+typedef LINKSPEC_H AAC_DECODER_ERROR (*imp_aacDecoder_Fill)(HANDLE_AACDECODER self, UCHAR *pBuffer[], const UINT bufferSize[], UINT *bytesValid);
-+typedef LINKSPEC_H AAC_DECODER_ERROR (*imp_aacDecoder_DecodeFrame)(HANDLE_AACDECODER self, INT_PCM *pTimeData, const INT timeDataSize, const UINT flags);
-+typedef LINKSPEC_H CStreamInfo* (*imp_aacDecoder_GetStreamInfo)(HANDLE_AACDECODER self);
-+typedef LINKSPEC_H AAC_DECODER_ERROR (*imp_aacDecoder_ConfigRaw)(HANDLE_AACDECODER self, UCHAR *conf[], const UINT length[]);
-+typedef LINKSPEC_H AAC_DECODER_ERROR (*imp_aacDecoder_SetParam)(const HANDLE_AACDECODER self, const AACDEC_PARAM param, const INT value);
-+typedef LINKSPEC_H AAC_DECODER_ERROR (*imp_aacDecoder_AncDataInit)(HANDLE_AACDECODER self, UCHAR *buffer, int size);
-+
-+typedef struct _aacDecLib {
-+    imp_aacDecoder_Open aacDecoder_Open;
-+    imp_aacDecoder_Close aacDecoder_Close;
-+    imp_aacDecoder_Fill aacDecoder_Fill;
-+    imp_aacDecoder_DecodeFrame aacDecoder_DecodeFrame;
-+    imp_aacDecoder_ConfigRaw aacDecoder_ConfigRaw;
-+    imp_aacDecoder_GetStreamInfo aacDecoder_GetStreamInfo;
-+    imp_aacDecoder_SetParam aacDecoder_SetParam;
-+    imp_aacDecoder_AncDataInit aacDecoder_AncDataInit;
-+} aacDecLib;
-+
-+#define DLSYM(x) \
-+    do \
-+    { \
-+        s->pfn.x = ( imp_##x ) dlsym(s->hLib, AV_STRINGIFY(x)); \
-+        if (!s->pfn.x ) \
-+        { \
-+            av_log(avctx, AV_LOG_ERROR, "Unable to find symbol " AV_STRINGIFY(x) " in dynamic " LIBNAME "\n"); \
-+            return -1; \
-+        } \
-+    } while (0)
-+
- /* The version macro is introduced the same time as the setting enum was
-  * changed, so this check should suffice. */
- #ifndef AACDECODER_LIB_VL0
-@@ -41,6 +83,8 @@ enum ConcealMethod {
- typedef struct FDKAACDecContext {
-     const AVClass *class;
-     HANDLE_AACDECODER handle;
-+    void *hLib;
-+    aacDecLib pfn;
-     uint8_t *decoder_buffer;
-     int decoder_buffer_size;
-     uint8_t *anc_buffer;
-@@ -88,7 +132,7 @@ static const AVClass fdk_aac_dec_class = {
- static int get_stream_info(AVCodecContext *avctx)
- {
-     FDKAACDecContext *s   = avctx->priv_data;
--    CStreamInfo *info     = aacDecoder_GetStreamInfo(s->handle);
-+    CStreamInfo *info     = s->pfn.aacDecoder_GetStreamInfo(s->handle);
-     int channel_counts[0x24] = { 0 };
-     int i, ch_error       = 0;
-     uint64_t ch_layout    = 0;
-@@ -200,8 +244,10 @@ static av_cold int fdk_aac_decode_close(AVCodecContext *avctx)
- {
-     FDKAACDecContext *s = avctx->priv_data;
- 
--    if (s->handle)
--        aacDecoder_Close(s->handle);
-+    if (s->hLib && s->handle) {
-+        s->pfn.aacDecoder_Close(s->handle);
-+        dlclose(s->hLib);
-+    }
-     av_freep(&s->decoder_buffer);
-     av_freep(&s->anc_buffer);
- 
-@@ -213,6 +259,27 @@ static av_cold int fdk_aac_decode_init(AVCodecContext *avctx)
-     FDKAACDecContext *s = avctx->priv_data;
-     AAC_DECODER_ERROR err;
- 
-+    if (!(s->hLib = dlopen(LIBNAME, RTLD_NOW))) {
-+        av_log(avctx, AV_LOG_ERROR, "Unable to load " LIBNAME "\n");
-+        return -1;
-+    }
-+
-+    DLSYM(aacDecoder_Open);
-+#define aacDecoder_Open s->pfn.aacDecoder_Open
-+    DLSYM(aacDecoder_Close);
-+    DLSYM(aacDecoder_Fill);
-+#define aacDecoder_Fill s->pfn.aacDecoder_Fill
-+    DLSYM(aacDecoder_DecodeFrame);
-+#define aacDecoder_DecodeFrame s->pfn.aacDecoder_DecodeFrame
-+    DLSYM(aacDecoder_GetStreamInfo);
-+#define aacDecoder_GetStreamInfo s->pfn.aacDecoder_GetStreamInfo
-+    DLSYM(aacDecoder_ConfigRaw);
-+#define aacDecoder_ConfigRaw s->pfn.aacDecoder_ConfigRaw
-+    DLSYM(aacDecoder_SetParam);
-+#define aacDecoder_SetParam s->pfn.aacDecoder_SetParam
-+    DLSYM(aacDecoder_AncDataInit);
-+#define aacDecoder_AncDataInit s->pfn.aacDecoder_AncDataInit
-+
-     s->handle = aacDecoder_Open(avctx->extradata_size ? TT_MP4_RAW : TT_MP4_ADTS, 1);
-     if (!s->handle) {
-         av_log(avctx, AV_LOG_ERROR, "Error opening decoder\n");
-diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
-index d47137b227..6295af3858 100644
---- a/libavcodec/libfdk-aacenc.c
-+++ b/libavcodec/libfdk-aacenc.c
-@@ -17,6 +17,17 @@
-  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
- 
-+#ifndef _WIN32
-+#include <dlfcn.h>
-+#define LIBNAME "libfdk-aac.so.1"
-+#else
-+#include <windows.h>
-+#define LIBNAME "libfdk-aac-1.dll"
-+#define dlopen(fname, f) ((void *) LoadLibraryA(fname))
-+#define dlclose(handle) FreeLibrary((HMODULE) handle)
-+#define dlsym(handle, name) GetProcAddress((HMODULE) handle, name)
-+#endif
-+
- #include <fdk-aac/aacenc_lib.h>
- 
- #include "libavutil/channel_layout.h"
-@@ -26,6 +37,31 @@
- #include "audio_frame_queue.h"
- #include "internal.h"
- 
-+typedef AACENC_ERROR (*imp_aacEncOpen)(HANDLE_AACENCODER *phAacEncoder, const UINT encModules, const UINT maxChannels);
-+typedef AACENC_ERROR (*imp_aacEncClose)(HANDLE_AACENCODER *phAacEncoder);
-+typedef AACENC_ERROR (*imp_aacEncEncode)(const HANDLE_AACENCODER hAacEncoder, const AACENC_BufDesc *inBufDesc, const AACENC_BufDesc *outBufDesc, const AACENC_InArgs *inargs, AACENC_OutArgs *outargs);
-+typedef AACENC_ERROR (*imp_aacEncInfo)(const HANDLE_AACENCODER hAacEncoder, AACENC_InfoStruct *pInfo);
-+typedef AACENC_ERROR (*imp_aacEncoder_SetParam)(const HANDLE_AACENCODER hAacEncoder, const AACENC_PARAM param, const UINT value);
-+
-+typedef struct _aacEncLib {
-+    imp_aacEncOpen aacEncOpen;
-+    imp_aacEncClose aacEncClose;
-+    imp_aacEncEncode aacEncEncode;
-+    imp_aacEncInfo aacEncInfo;
-+    imp_aacEncoder_SetParam aacEncoder_SetParam;
-+} aacEncLib;
-+
-+#define DLSYM(x) \
-+    do \
-+    { \
-+        s->pfn.x = ( imp_##x ) dlsym(s->hLib, AV_STRINGIFY(x)); \
-+        if (!s->pfn.x ) \
-+        { \
-+            av_log(avctx, AV_LOG_ERROR, "Unable to find symbol " AV_STRINGIFY(x) " in dynamic " LIBNAME "\n"); \
-+            return -1; \
-+        } \
-+    } while (0)
-+
- typedef struct AACContext {
-     const AVClass *class;
-     HANDLE_AACENCODER handle;
-@@ -36,6 +72,8 @@ typedef struct AACContext {
-     int header_period;
-     int vbr;
- 
-+    void *hLib;
-+    aacEncLib pfn;
-     AudioFrameQueue afq;
- } AACContext;
- 
-@@ -96,8 +134,10 @@ static int aac_encode_close(AVCodecContext *avctx)
- {
-     AACContext *s = avctx->priv_data;
- 
--    if (s->handle)
--        aacEncClose(&s->handle);
-+    if (s->hLib && s->handle) {
-+        s->pfn.aacEncClose(&s->handle);
-+        dlclose(s->hLib);
-+    }
-     av_freep(&avctx->extradata);
-     ff_af_queue_close(&s->afq);
- 
-@@ -114,6 +154,21 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
-     int aot = FF_PROFILE_AAC_LOW + 1;
-     int sce = 0, cpe = 0;
- 
-+    if (!(s->hLib = dlopen(LIBNAME, RTLD_NOW))) {
-+        av_log(avctx, AV_LOG_ERROR, "Unable to load " LIBNAME "\n");
-+        return -1;
-+    }
-+
-+    DLSYM(aacEncOpen);
-+#define aacEncOpen s->pfn.aacEncOpen
-+    DLSYM(aacEncClose);
-+    DLSYM(aacEncEncode);
-+#define aacEncEncode s->pfn.aacEncEncode
-+    DLSYM(aacEncInfo);
-+#define aacEncInfo s->pfn.aacEncInfo
-+    DLSYM(aacEncoder_SetParam);
-+#define aacEncoder_SetParam s->pfn.aacEncoder_SetParam
-+
-     if ((err = aacEncOpen(&s->handle, 0, avctx->channels)) != AACENC_OK) {
-         av_log(avctx, AV_LOG_ERROR, "Unable to open the encoder: %s\n",
-                aac_get_error(err));
--- 
-2.15.1

patches/0002-patch-ffmpeg-to-new-fdk-api.patch

@@ -1,57 +0,0 @@
---- libavcodec/libfdk-aacenc.c.orig     2018-09-04 17:31:43.145385000 +0200
-+++ libavcodec/libfdk-aacenc.c  2018-09-04 17:39:10.786071200 +0200
-@@ -289,7 +289,7 @@
-     }
-
-     avctx->frame_size = info.frameLength;
--    avctx->initial_padding = info.encoderDelay;
-+    avctx->initial_padding = info.nDelay;
-     ff_af_queue_init(avctx, &s->afq);
-
-     if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {
-@@ -322,28 +322,35 @@
-     int out_buffer_size, out_buffer_element_size;
-     void *in_ptr, *out_ptr;
-     int ret;
-+    uint8_t dummy_buf[1];
-     AACENC_ERROR err;
-
-     /* handle end-of-stream small frame and flushing */
-     if (!frame) {
-+        /* Must be a non-null pointer, even if it's a dummy. We could use
-+         * the address of anything else on the stack as well. */
-+        in_ptr               = dummy_buf;
-+        in_buffer_size       = 0;
-+
-         in_args.numInSamples = -1;
-     } else {
--        in_ptr                   = frame->data[0];
--        in_buffer_size           = 2 * avctx->channels * frame->nb_samples;
--        in_buffer_element_size   = 2;
--
--        in_args.numInSamples     = avctx->channels * frame->nb_samples;
--        in_buf.numBufs           = 1;
--        in_buf.bufs              = &in_ptr;
--        in_buf.bufferIdentifiers = &in_buffer_identifier;
--        in_buf.bufSizes          = &in_buffer_size;
--        in_buf.bufElSizes        = &in_buffer_element_size;
-+        in_ptr               = frame->data[0];
-+        in_buffer_size       = 2 * avctx->channels * frame->nb_samples;
-+
-+        in_args.numInSamples = avctx->channels * frame->nb_samples;
-
-         /* add current frame to the queue */
-         if ((ret = ff_af_queue_add(&s->afq, frame)) < 0)
-             return ret;
-     }
-
-+    in_buffer_element_size   = 2;
-+    in_buf.numBufs           = 1;
-+    in_buf.bufs              = &in_ptr;
-+    in_buf.bufferIdentifiers = &in_buffer_identifier;
-+    in_buf.bufSizes          = &in_buffer_size;
-+    in_buf.bufElSizes        = &in_buffer_element_size;
-+
-     /* The maximum packet size is 6144 bits aka 768 bytes per channel. */
-     if ((ret = ff_alloc_packet2(avctx, avpkt, FFMAX(8192, 768 * avctx->channels), 0)) < 0)
-         return ret;

patches/0002-set-matroska-timebase-to-one-microsecond.patch

@@ -1,13 +0,0 @@
---- libavformat/matroskaenc.c	2018-08-10 22:18:59.051659000 +0200
-+++ libavformat/matroskaenc2.c	2018-08-10 22:18:31.932030400 +0200
-@@ -2671,8 +2671,8 @@
-     }
- 
-     for (i = 0; i < s->nb_streams; i++) {
--        // ms precision is the de-facto standard timescale for mkv files
--        avpriv_set_pts_info(s->streams[i], 64, 1, 1000);
-+        // ms precision is the de-facto standard timescale for mkv files (Patched: We're using microseconds!!)
-+        avpriv_set_pts_info(s->streams[i], 64, 1, 1000000);
-     }
- 
-     return 0;