Update ffmpeg-lgpl.yaml

.github/actions/libfdkaac/action.yml

@@ -35,7 +35,7 @@ runs:
     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 ; make install ; cd ../build ; tar czf ../dist/libfdkaac.tgz *'
+      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:

.github/actions/libkvazaar/action.yml

@@ -0,0 +1,44 @@
+name: libkvazaar
+
+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 KVAZAAR
+    uses: actions/checkout@v3.0.0
+    with:
+      repository: ultravideo/kvazaar
+      ref: ${{ inputs.refId }}
+      path: kvazaar        
+  - 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 KVAZAAR
+    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 kvazaar ; ./autogen.sh ;  CC=cl ./configure --prefix=$(realpath ../build) CPPFLAGS=-DKVZ_STATIC_LIB || true ; make -j ; make install-lib-static ; cd ../build ; tar czf ../dist/libkvazaar.tgz *'
+  - name: Publish artifact
+    uses: actions/upload-artifact@v2
+    with:
+      name: libopus-${{ runner.os }}-${{ inputs.config }}
+      path: dist/libkvazaar.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/libvpx/action.yml

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

.github/workflows/ffmpeg-lgpl.yaml

@@ -0,0 +1,205 @@
+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: 'release/6.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: "--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: v2023.3.1
+        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 }}
+
+  #libkvazaar:
+  #  runs-on: ${{ inputs.system }}
+  #  steps:
+  #  - uses: actions/checkout@v3
+  #  - uses: ./.github/actions/libkvazaar
+  #    with:
+  #      refId: v2.3.0
+  #      config: ${{ inputs.config }}
+
+  ffmpeg:
+    runs-on: ${{ inputs.system }}
+    needs: [libvpl,libsvtav1,libsnappy,libvpx,libmp3lame,libzimg,libopus]
+    #libkvazaar,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: Create PFX certificate
+      id: create-pfx
+      shell: pwsh
+      env:
+        PFX_CONTENT: ${{ secrets.CODESIGN_PFX }} 
+      run: |
+        $pfxPath = Join-Path -Path $env:RUNNER_TEMP -ChildPath "cert.pfx"; 
+        $encodedBytes = [System.Convert]::FromBase64String($env:PFX_CONTENT); 
+        Set-Content $pfxPath -Value $encodedBytes -AsByteStream;
+        Write-Output "::set-output name=PFX_PATH::$pfxPath";        
+    - name: Set up GIT
+      run: |
+        git config --global core.autocrlf false
+        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 --enable-cuda ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../build/lib ;  rm -rf cmake pkgconfig *.la ; cd .. ; tar czf ../dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz *'
+    - name: Publish FFmpeg artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: FFmpeg ${{ inputs.system }} ${{ inputs.config }}${{ inputs.config }} package build
+        path: dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz

.github/workflows/ffmpeg.yml

@@ -1,4 +1,4 @@
-name: 'Build FFmpeg'
+name: 'Build FFmpeg (GPL)'
 
 on:
   workflow_dispatch:
@@ -23,7 +23,7 @@ on:
       config:
         type: choice
         required: true
-        default: 'debug' 
+        default: 'release' 
         description: 'Configuration'
         options: 
         - debug
@@ -32,7 +32,7 @@ on:
       ffmpegRef:
         type: string
         required: true
-        default: 'release/5.1' 
+        default: 'release/6.1' 
         description: 'FFmpeg refId'
         
   workflow_call:
@@ -52,7 +52,7 @@ on:
         
 env:
   vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
-  COMPONENTS: "--enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libopus --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libfdk-aac --enable-libvpx "
+  COMPONENTS: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libvorbis --enable-libopus --enable-libvpx --enable-libx264 --enable-libx265 --enable-libfdk-aac"
   NASM_EXECUTABLE: nasm
   cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
   variant: ${{ inputs.type == 'static' && ' --pkg-config-flags="--static" --disable-shared --enable-static' || ' --disable-static --enable-shared' }}
@@ -65,7 +65,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libvpl
       with:
-        refId: master
+        refId: v2023.4.0
         config: ${{ inputs.config }}
 
   liboggvorbis:
@@ -84,16 +84,16 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libsvtav1
       with:
-        refId: v1.2.0
+        refId: v1.7.0
         config: ${{ inputs.config }}
-       
+
   libsnappy:
     runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libsnappy
       with:
-        refId: 1.1.9
+        refId: 1.1.10
         config: ${{ inputs.config }}
 
   libvpx:
@@ -102,7 +102,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libvpx
       with:
-        refId: v1.12.0
+        refId: v1.13.1
         config: ${{ inputs.config }}
 
   libmp3lame:
@@ -120,7 +120,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libzimg
       with:
-        refId: release-3.0.4
+        refId: release-3.0.5
         config: ${{ inputs.config }}
 
   libopus:
@@ -129,7 +129,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libopus
       with:
-        refId: v1.3.1
+        refId: v1.4
         config: ${{ inputs.config }}
 
   libfdkaac:
@@ -180,7 +180,7 @@ jobs:
 
   ffmpeg:
     runs-on: ${{ inputs.system }}
-    needs: [libvpl,libopus,libsvtav1,libsnappy,libmp3lame,libzimg,liboggvorbis,libx264,libx265,libfdkaac,libvpx]
+    needs: [libvpl,libsvtav1,libsnappy,libvpx,libmp3lame,libzimg,liboggvorbis,libopus,libfdkaac,libx264,libx265]
     steps:
     - name: Set up MSYS2
       uses: msys2/setup-msys2@v2
@@ -221,8 +221,8 @@ jobs:
       shell: cmd
       run: |
         call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
-        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 ../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 *'
+        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:

.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: 'SVT-AV1'
+name: 'Test'
 
 on:
   workflow_dispatch:
@@ -14,7 +14,7 @@ on:
       type:
         type: choice
         required: true
-        default: 'static' 
+        default: 'shared' 
         description: Type
         options: 
         - static
@@ -23,7 +23,7 @@ on:
       config:
         type: choice
         required: true
-        default: 'debug' 
+        default: 'release' 
         description: 'Configuration'
         options: 
         - debug
@@ -32,23 +32,40 @@ on:
       ffmpegRef:
         type: string
         required: true
-        default: 'release/5.1' 
+        default: 'release/6.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: "--enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libopus --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libfdk-aac --enable-libvpx "
+  COMPONENTS: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libvpx --enable-libopus --enable-libkvazaar"
+  #--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' }}
+  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:
-  libsvtav1:
+  libkvazaar:
     runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
-    - uses: ./.github/actions/libsvtav1
+    - uses: ./.github/actions/libkvazaar
       with:
-        refId: v1.2.0
+        refId: v2.3.0
         config: ${{ inputs.config }}
+

libfdkaac.patch

@@ -1,8 +1,8 @@
 diff --git a/configure b/configure
-index 77facac8c9..ab117fba2c 100755
+index b6616f00b6..d02f5099fe 100755
 --- a/configure
 +++ b/configure
-@@ -1785,7 +1785,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
+@@ -1774,7 +1774,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
  
  EXTERNAL_LIBRARY_NONFREE_LIST="
      decklink
@@ -10,7 +10,7 @@ index 77facac8c9..ab117fba2c 100755
      libtls
  "
  
-@@ -1882,6 +1881,7 @@ EXTERNAL_LIBRARY_LIST="
+@@ -1873,6 +1872,7 @@ EXTERNAL_LIBRARY_LIST="
      openssl
      pocketsphinx
      vapoursynth
@@ -18,7 +18,7 @@ index 77facac8c9..ab117fba2c 100755
  "
  
  HWACCEL_AUTODETECT_LIBRARY_LIST="
-@@ -6524,9 +6524,7 @@ enabled libdav1d          && require_pkg_config libdav1d "dav1d >= 0.5.0" "dav1d
+@@ -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
@@ -29,138 +29,11 @@ index 77facac8c9..ab117fba2c 100755
  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 e9096a08e6..cc4d79c651 100644
---- a/libavcodec/libfdk-aacdec.c
-+++ b/libavcodec/libfdk-aacdec.c
-@@ -25,6 +25,7 @@
- #include "avcodec.h"
- #include "codec_internal.h"
- #include "internal.h"
-+#include "libfdk-aac_internal.h"
- 
- #ifdef AACDECODER_LIB_VL0
- #define FDKDEC_VER_AT_LEAST(vl0, vl1) \
-@@ -48,6 +49,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;
-@@ -113,7 +116,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;
-@@ -231,8 +234,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);
- 
-@@ -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;
-+    }
-+
-+    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 d004ae00c3..902dddb365 100644
---- a/libavcodec/libfdk-aacenc.c
-+++ b/libavcodec/libfdk-aacenc.c
-@@ -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) \
-@@ -47,6 +48,8 @@ typedef struct AACContext {
-     int header_period;
-     int vbr;
- 
-+    void *hLib;
-+    aacEncLib pfn;
-     AudioFrameQueue afq;
- } AACContext;
- 
-@@ -111,8 +114,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);
-+    }
-     ff_af_queue_close(&s->afq);
- 
-     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))) {
-+        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->ch_layout.nb_channels)) != AACENC_OK) {
-         av_log(avctx, AV_LOG_ERROR, "Unable to open the encoder: %s\n",
-                aac_get_error(err));
-diff --git a/libfdk-aac_internal.h b/libfdk-aac_internal.h
+diff --git a/libavcodec/libfdk-aac_internal.h b/libavcodec/libfdk-aac_internal.h
 new file mode 100644
 index 0000000000..9bcfdb9aba
 --- /dev/null
-+++ b/libfdk-aac_internal.h
++++ b/libavcodec/libfdk-aac_internal.h
 @@ -0,0 +1,84 @@
 +/*
 + * Copyright (c) 2018 Gianluigi Tiesi
@@ -247,3 +120,130 @@ index 0000000000..9bcfdb9aba
 +
 +#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 8c1586e25e..25f68cdd10 100644
+--- a/libavcodec/libfdk-aacdec.c
++++ b/libavcodec/libfdk-aacdec.c
+@@ -25,6 +25,7 @@
+ #include "avcodec.h"
+ #include "codec_internal.h"
+ #include "decode.h"
++#include "libfdk-aac_internal.h"
+ 
+ #ifdef AACDECODER_LIB_VL0
+ #define FDKDEC_VER_AT_LEAST(vl0, vl1) \
+@@ -48,6 +49,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;
+@@ -113,7 +116,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;
+@@ -231,8 +234,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);
+ 
+@@ -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;
++	}
++
++	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 54549de473..9e93ce092c 100644
+--- a/libavcodec/libfdk-aacenc.c
++++ b/libavcodec/libfdk-aacenc.c
+@@ -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) \
+@@ -46,6 +47,8 @@ typedef struct AACContext {
+     int latm;
+     int header_period;
+     int vbr;
++	void *hLib;
++	aacEncLib pfn;
+ 
+     AudioFrameQueue afq;
+ } AACContext;
+@@ -111,8 +114,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);
++    }
+     ff_af_queue_close(&s->afq);
+ 
+     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))) {
++        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->ch_layout.nb_channels)) != AACENC_OK) {
+         av_log(avctx, AV_LOG_ERROR, "Unable to open the encoder: %s\n",
+                aac_get_error(err));