[ffmpeg] update to upstream version 4.4 (#17735)

* [ffmpeg] update to version 4.4

* [ffmpeg] format-manifest

* [ffmpeg] remove avresample as default feature (it is deprecated, not upstream default, and will be removed in 4.5)

* [ffmpeg] x-add-version

* [ffmpeg] add avresample under the all feature

* [ffmpeg] x-add-version

* [ffmpeg] remove unused patch

* [ffmpeg] x-add-version

* [ffmpeg] remove wavpack from FindFFMPEG

* [ffmpeg] x-add-version

* [ffmpeg] fix compile cuda issue

* [ffmpeg] x-add-version

* [ffmpeg] only apply cuda compile patch on windows targets

* [ffmpeg] x-add-version

9 files changed, 622 insertions, 267 deletions

diff --git a/ports/ffmpeg/0008-Fix-wavpack-detection.patch b/ports/ffmpeg/0008-Fix-wavpack-detection.patch
deleted file mode 100644
index 959ee8a1b..000000000
--- a/ports/ffmpeg/0008-Fix-wavpack-detection.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/configure b/configure
-index e7162dbc56..0f04af2a81 100755
---- a/configure
-+++ b/configure
-@@ -6391,7 +6391,7 @@ enabled libvpx            && {
-     fi
- }
- 
--enabled libwavpack        && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput  -lwavpack
-+enabled libwavpack        && { check_pkg_config libwavpack wavpack wavpack.h WavpackOpenFileOutput || check_lib libwavpack wavpack.h WavpackOpenFileOutput -lwavpack || check_lib libwavpack wavpack.h WavpackOpenFileOutput -llibwavpack || require libwavpack wavpack.h WavpackOpenFileOutput -lwavpackdll; }
- enabled libwebp           && {
-     enabled libwebp_encoder      && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion
-     enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; }
-diff --git a/libavcodec/libwavpackenc.c b/libavcodec/libwavpackenc.c
-index e84b074893..9adf39861b 100644
---- a/libavcodec/libwavpackenc.c
-+++ b/libavcodec/libwavpackenc.c
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-  */
- 
--#include <wavpack/wavpack.h>
-+#include <wavpack.h>
- #include <string.h>
- 
- #include "libavutil/attributes.h"
-
diff --git a/ports/ffmpeg/0016-configure-dnn-needs-avformat.patch b/ports/ffmpeg/0016-configure-dnn-needs-avformat.patch
index 658f7446e..e789e5bec 100644
--- a/ports/ffmpeg/0016-configure-dnn-needs-avformat.patch
+++ b/ports/ffmpeg/0016-configure-dnn-needs-avformat.patch
@@ -1,23 +1,22 @@
-From e5f322be7b782a1d831b63662c849b2f04c212fd Mon Sep 17 00:00:00 2001
+From 7ca15b7f337b00a71384f748d05fce89fcf15a8d Mon Sep 17 00:00:00 2001
 From: "Matthias C. M. Troffaes" <matthias.troffaes@gmail.com>
-Date: Tue, 4 May 2021 13:47:58 +0100
+Date: Tue, 4 May 2021 13:03:17 +0100
 Subject: [PATCH] configure: dnn needs avformat
 
-The source file "libavfilter/dnn/dnn_backend_native.h" includes
-"libavformat/avio.h", so avformat needs to be declared as a dependency.
 ---
- configure | 1 +
- 1 file changed, 1 insertion(+)
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 36713ab658..84f7980dc2 100755
+index 9e45c0822c..8725a94f8a 100755
 --- a/configure
 +++ b/configure
-@@ -2621,6 +2621,7 @@ cbs_vp9_select="cbs"
+@@ -2660,7 +2660,7 @@ cbs_vp9_select="cbs"
  dct_select="rdft"
  dirac_parse_select="golomb"
- dnn_suggest="libtensorflow"
-+dnn_deps="avformat"
+ dnn_suggest="libtensorflow libopenvino"
+-dnn_deps="swscale"
++dnn_deps="avformat swscale"
  error_resilience_select="me_cmp"
  faandct_deps="faan"
  faandct_select="fdctdsp"
diff --git a/ports/ffmpeg/0017-Patch-for-ticket-9019-CUDA-Compile-Broken-Using-MSVC.patch b/ports/ffmpeg/0017-Patch-for-ticket-9019-CUDA-Compile-Broken-Using-MSVC.patch
new file mode 100644
index 000000000..c80e51ad7
--- /dev/null
+++ b/ports/ffmpeg/0017-Patch-for-ticket-9019-CUDA-Compile-Broken-Using-MSVC.patch
@@ -0,0 +1,44 @@
+From 6dd12a7210fb4cf2e69b6c83628021d83ba132c3 Mon Sep 17 00:00:00 2001
+From: "Don C. Bigler" <don.bigler@framatome.com>
+Date: Fri, 4 Dec 2020 12:39:55 -0500
+Subject: [PATCH] Patch for ticket #9019 CUDA Compile Broken Using MSVC
+
+Signed-off-by: Don C. Bigler <don.bigler@framatome.com>
+---
+ compat/cuda/ptx2c.sh | 7 ++++---
+ configure            | 1 +
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/compat/cuda/ptx2c.sh b/compat/cuda/ptx2c.sh
+index 48452379c2..1c486dc30e 100755
+--- a/compat/cuda/ptx2c.sh
++++ b/compat/cuda/ptx2c.sh
+@@ -26,9 +26,10 @@ OUT="$1"
+ IN="$2"
+ NAME="$(basename "$IN" | sed 's/\..*//')"
+ 
+-printf "const char %s_ptx[] = \\" "$NAME" > "$OUT"
++printf "const char %s_ptx[] = {\\" "$NAME" > "$OUT"
+ echo >> "$OUT"
+-sed -e "$(printf 's/\r//g')" -e 's/["\\]/\\&/g' -e "$(printf 's/^/\t"/')" -e 's/$/\\n"/' < "$IN" >> "$OUT"
+-echo ";" >> "$OUT"
++xxd -i < "$IN" >> "$OUT"
++echo "  ,0x00" >> "$OUT"
++echo "};" >> "$OUT"
+ 
+ exit 0
+diff --git a/configure b/configure
+index 1b1b140d6f..048e02355f 100755
+--- a/configure
++++ b/configure
+@@ -1050,6 +1050,7 @@ test_nvcc(){
+     tmpo_=$TMPO
+     [ -x "$(command -v cygpath)" ] && tmpcu_=$(cygpath -m $tmpcu_) && tmpo_=$(cygpath -m $tmpo_)
+     test_cmd $nvcc $nvccflags "$@" $NVCC_C $(nvcc_o $tmpo_) $tmpcu_
++    test_cmd xxd
+ }
+ 
+ check_nvcc() {
+-- 
+2.26.2.windows.1
+
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
deleted file mode 100644
index 64d238cd0..000000000
--- a/ports/ffmpeg/CONTROL
+++ /dev/null
@@ -1,211 +0,0 @@
-Source: ffmpeg
-Version: 4.3.2
-Port-Version: 11
-Homepage: https://ffmpeg.org
-Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
-  FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.
-Default-Features: avresample, avcodec, avformat, avdevice, avfilter, postproc, swresample, swscale
-
-Feature: ffmpeg
-Build-Depends: ffmpeg[core,avcodec,avfilter,avformat]
-Description: Build the ffmpeg application
-
-Feature: ffplay
-Build-Depends: ffmpeg[core,avcodec,avfilter,avformat,swscale,swresample,sdl2]
-Description: Build the ffplay application
-
-Feature: ffprobe
-Build-Depends: ffmpeg[core,avcodec,avformat]
-Description: Build the ffprobe application
-
-Feature: avcodec
-Description: Build the avcodec library
-
-Feature: avformat
-Build-Depends: ffmpeg[core,avcodec]
-Description: Build the avformat library
-
-Feature: avdevice
-Build-Depends: ffmpeg[core,avcodec,avformat]
-Description: Build the avdevice library
-
-Feature: avfilter
-Description: Build the avfilter library
-
-Feature: postproc
-Build-Depends: ffmpeg[core,gpl]
-Description: Build the postproc library
-
-Feature: swresample
-Description: Build the swresample library
-
-Feature: swscale
-Description: Build the swscale library
-
-Feature: avresample
-Description: Build the avresample library
-
-Feature: nonfree
-Description: Allow use of nonfree code, the resulting libs and binaries will be unredistributable
-
-Feature: gpl
-Description: Allow use of GPL code, the resulting libs and binaries will be under GPL
-
-Feature: version3
-Description: Upgrade (L)GPL to version 3
-
-Feature: all
-Build-Depends: ffmpeg[bzip2,iconv,freetype,lzma,mp3lame,openh264,openjpeg,opus,snappy,soxr,speex,theora,vorbis,vpx,webp,zlib], ffmpeg[ass] (!(uwp | arm)), ffmpeg[dav1d] (!(uwp | arm | x86 | osx)), ffmpeg[fontconfig] (!(windows & static) & !(uwp | arm)), ffmpeg[fribidi] (!(uwp | arm)), ffmpeg[ilbc] (!(arm & uwp)), ffmpeg[modplug] (!(windows & static) & !uwp), ffmpeg[nvcodec] ((windows | linux) & !uwp & !arm), ffmpeg[opencl] (!uwp), ffmpeg[ssh] (!(uwp | arm) & !static), ffmpeg[opengl] (!uwp & !(windows & arm) & !osx), ffmpeg[sdl2] (!osx), ffmpeg[tensorflow] (!(x86 | arm | uwp) & !static), ffmpeg[tesseract] (!uwp & !(windows & arm) & !static), ffmpeg[wavpack] (!arm), ffmpeg[xml2] (!static)
-Description: Build with all allowed dependencies selected that are compatible with the lgpl license
-
-Feature: all-gpl
-Build-Depends: ffmpeg[gpl,all], ffmpeg[avisynthplus] (windows & !arm & !uwp & !static), ffmpeg[x264] (!arm), ffmpeg[x265] (!arm & !uwp)
-Description: Build with all allowed dependencies selected that are compatible with the gpl license
-
-Feature: all-nonfree
-Build-Depends: ffmpeg[nonfree,all-gpl,openssl], ffmpeg[fdk-aac] (!arm & !uwp)
-Description: Build with all allowed dependencies selected with a non-redistributable license
-
-Feature: ass
-Build-Depends: libass
-Description: Libass subtitles rendering, needed for subtitles and ass filter support in ffmpeg
-
-Feature: avisynthplus
-Build-Depends: avisynthplus, ffmpeg[core,gpl]
-Description: Reading of AviSynth script files
-
-Feature: bzip2
-Build-Depends: bzip2
-Description: Bzip2 support
-
-Feature: dav1d
-Build-Depends: dav1d
-Description: AV1 decoding via libdav1d
-
-Feature: iconv
-Build-Depends: libiconv
-Description: Iconv support
-
-Feature: ilbc
-Build-Depends: libilbc
-Description: iLBC de/encoding via libilbc
-
-Feature: fdk-aac
-Build-Depends: fdk-aac, ffmpeg[core,nonfree]
-Description: AAC de/encoding via libfdk-aac
-
-Feature: fontconfig
-Build-Depends: fontconfig
-Description: Useful for drawtext filter
-
-Feature: freetype
-Build-Depends: freetype
-Description: Needed for drawtext filter
-
-Feature: fribidi
-Build-Depends: fribidi
-Description: Improves drawtext filter
-
-Feature: lzma
-Build-Depends: liblzma
-Description: lzma support
-
-Feature: modplug
-Build-Depends: libmodplug
-Description: ModPlug via libmodplug
-
-Feature: mp3lame
-Build-Depends: mp3lame
-Description: MP3 encoding via libmp3lame
-
-Feature: nvcodec
-Build-Depends: ffnvcodec
-Description: Nvidia video decoding/encoding acceleration
-
-Feature: opencl
-Build-Depends: opencl
-Description: OpenCL processing
-
-Feature: opengl
-Build-Depends: opengl, opengl-registry
-Description: OpenGL rendering
-
-Feature: openh264
-Build-Depends: openh264
-Description: H.264 de/encoding via openh264
-
-Feature: openjpeg
-Build-Depends: openjpeg
-Description: JPEG 2000 de/encoding via OpenJPEG
-
-Feature: openssl
-Build-Depends: openssl, ffmpeg[core,nonfree]
-Description: Needed for https support if gnutls, libtls or mbedtls is not used
-
-Feature: opus
-Build-Depends: opus
-Description: Opus de/encoding via libopus
-
-Feature: sdl2
-Build-Depends: sdl2
-Description: Sdl2 support
-
-Feature: snappy
-Build-Depends: snappy
-Description: Snappy compression, needed for hap encoding
-
-Feature: soxr
-Build-Depends: soxr, ffmpeg[core,swresample]
-Description: Include libsoxr resampling
-
-Feature: speex
-Build-Depends: speex
-Description: Speex de/encoding via libspeex
-
-Feature: ssh
-Build-Depends: libssh
-Description: SFTP protocol via libssh
-
-Feature: tensorflow
-Build-Depends: tensorflow
-Description: TensorFlow as a DNN module backend for DNN based filters like sr
-
-Feature: tesseract
-Build-Depends: tesseract
-Description: Tesseract, needed for ocr filter
-
-Feature: theora
-Build-Depends: libtheora
-Description: Theora encoding via libtheora
-
-Feature: vorbis
-Build-Depends: libvorbis
-Description: Vorbis en/decoding via libvorbis, native implementation exists
-
-Feature: vpx
-Build-Depends: libvpx
-Description: VP8 and VP9 de/encoding via libvpx
-
-Feature: wavpack
-Build-Depends: wavpack
-Description: Wavpack encoding via libwavpack
-
-Feature: webp
-Build-Depends: libwebp
-Description: WebP encoding via libwebp
-
-Feature: x264
-Build-Depends: x264, ffmpeg[core,gpl]
-Description: H.264 encoding via x264
-
-Feature: x265
-Build-Depends: x265, ffmpeg[core,gpl]
-Description: HEVC encoding via x265
-
-Feature: xml2
-Build-Depends: libxml2
-Description: XML parsing using the C library libxml2, needed for dash demuxing support
-
-Feature: zlib
-Build-Depends: zlib
-Description: zlib support
diff --git a/ports/ffmpeg/FindFFMPEG.cmake.in b/ports/ffmpeg/FindFFMPEG.cmake.in
index 69beb4f82..9991a3488 100644
--- a/ports/ffmpeg/FindFFMPEG.cmake.in
+++ b/ports/ffmpeg/FindFFMPEG.cmake.in
@@ -292,12 +292,6 @@ if(@ENABLE_VPX@)
   list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS ${libvpx_LIBRARIES})
 endif()
 
-if(@ENABLE_WAVPACK@)
-  find_dependency(wavpack)
-  select_library_configurations_from_targets(BASENAME wavpack TARGETS WavPack::wavpack)
-  list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS ${wavpack_LIBRARIES})
-endif()
-
 if(@ENABLE_WEBP@)
   find_dependency(WebP)
   select_library_configurations_from_targets(BASENAME webp TARGETS WebP::webp WebP::webpdemux WebP::libwebpmux WebP::webpdecoder)
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index b6fb4d997..77cad0710 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -1,8 +1,11 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(PATCHES 0017-Patch-for-ticket-9019-CUDA-Compile-Broken-Using-MSVC.patch)  # https://trac.ffmpeg.org/ticket/9019
+endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ffmpeg/ffmpeg
-    REF n4.3.2
-    SHA512 95e6fdc5980d2940cac33be9015e3acc2e1ce5247ef92211889fcf120add1e6ef01089ca2b8d59c13f91761757ebfe9819dc87a24f690edcafa7e0626f06f64e
+    REF n4.4
+    SHA512 ae7426ca476df9fa9dba52cab06c38e484f835653fb2da57e7c06f5589d887c0854ee17df93a2f57191d498c1264cb1c69312cf0a8214b476800382e2d260c4b
     HEAD_REF master
     PATCHES
         0001-create-lib-libraries.patch
@@ -10,7 +13,6 @@ vcpkg_from_github(
         0004-fix-debug-build.patch
         0006-fix-StaticFeatures.patch
         0007-fix-lib-naming.patch
-        0008-Fix-wavpack-detection.patch
         0009-Fix-fdk-detection.patch
         0010-Fix-x264-detection.patch
         0011-Fix-x265-detection.patch
@@ -19,6 +21,7 @@ vcpkg_from_github(
         0014-avfilter-dependency-fix.patch  # http://ffmpeg.org/pipermail/ffmpeg-devel/2021-February/275819.html
         0015-Fix-xml2-detection.patch
         0016-configure-dnn-needs-avformat.patch  # http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html
+        ${PATCHES}
 )
 
 if (SOURCE_PATH MATCHES " ")
@@ -436,14 +439,6 @@ else()
     set(OPTIONS "${OPTIONS} --disable-libvpx")
 endif()
 
-set(ENABLE_WAVPACK OFF)
-if("wavpack" IN_LIST FEATURES)
-    set(OPTIONS "${OPTIONS} --enable-libwavpack")
-    set(ENABLE_WAVPACK ${STATIC_LINKAGE})
-else()
-    set(OPTIONS "${OPTIONS} --disable-libwavpack")
-endif()
-
 set(ENABLE_WEBP OFF)
 if("webp" IN_LIST FEATURES)
     set(OPTIONS "${OPTIONS} --enable-libwebp")
diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
new file mode 100644
index 000000000..870347efb
--- /dev/null
+++ b/ports/ffmpeg/vcpkg.json
@@ -0,0 +1,556 @@
+{
+  "name": "ffmpeg",
+  "version-string": "4.4",
+  "description": [
+    "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
+    "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."
+  ],
+  "homepage": "https://ffmpeg.org",
+  "default-features": [
+    "avcodec",
+    "avdevice",
+    "avfilter",
+    "avformat",
+    "postproc",
+    "swresample",
+    "swscale"
+  ],
+  "features": {
+    "all": {
+      "description": "Build with all allowed dependencies selected that are compatible with the lgpl license",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "features": [
+            "avresample",
+            "bzip2",
+            "freetype",
+            "iconv",
+            "lzma",
+            "mp3lame",
+            "openh264",
+            "openjpeg",
+            "opus",
+            "snappy",
+            "soxr",
+            "speex",
+            "theora",
+            "vorbis",
+            "vpx",
+            "webp",
+            "zlib"
+          ]
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "sdl2"
+          ],
+          "platform": "!osx"
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "opencl"
+          ],
+          "platform": "!uwp"
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "xml2"
+          ],
+          "platform": "!static"
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "ilbc"
+          ],
+          "platform": "!(arm & uwp)"
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "ass"
+          ],
+          "platform": "!(uwp | arm)"
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "fribidi"
+          ],
+          "platform": "!(uwp | arm)"
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "ssh"
+          ],
+          "platform": "!(uwp | arm) & !static"
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "dav1d"
+          ],
+          "platform": "!(uwp | arm | x86 | osx)"
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "modplug"
+          ],
+          "platform": "!(windows & static) & !uwp"
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "tensorflow"
+          ],
+          "platform": "!(x86 | arm | uwp) & !static"
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "opengl"
+          ],
+          "platform": "!uwp & !(windows & arm) & !osx"
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "nvcodec"
+          ],
+          "platform": "(windows | linux) & !uwp & !arm"
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "tesseract"
+          ],
+          "platform": "!uwp & !(windows & arm) & !static"
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "fontconfig"
+          ],
+          "platform": "!(windows & static) & !(uwp | arm)"
+        }
+      ]
+    },
+    "all-gpl": {
+      "description": "Build with all allowed dependencies selected that are compatible with the gpl license",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "features": [
+            "all",
+            "gpl"
+          ]
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "x264"
+          ],
+          "platform": "!arm"
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "x265"
+          ],
+          "platform": "!arm & !uwp"
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "avisynthplus"
+          ],
+          "platform": "windows & !arm & !uwp & !static"
+        }
+      ]
+    },
+    "all-nonfree": {
+      "description": "Build with all allowed dependencies selected with a non-redistributable license",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "features": [
+            "all-gpl",
+            "nonfree",
+            "openssl"
+          ]
+        },
+        {
+          "name": "ffmpeg",
+          "features": [
+            "fdk-aac"
+          ],
+          "platform": "!arm & !uwp"
+        }
+      ]
+    },
+    "ass": {
+      "description": "Libass subtitles rendering, needed for subtitles and ass filter support in ffmpeg",
+      "dependencies": [
+        "libass"
+      ]
+    },
+    "avcodec": {
+      "description": "Build the avcodec library"
+    },
+    "avdevice": {
+      "description": "Build the avdevice library",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "avcodec",
+            "avformat"
+          ]
+        }
+      ]
+    },
+    "avfilter": {
+      "description": "Build the avfilter library"
+    },
+    "avformat": {
+      "description": "Build the avformat library",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "avcodec"
+          ]
+        }
+      ]
+    },
+    "avisynthplus": {
+      "description": "Reading of AviSynth script files",
+      "dependencies": [
+        "avisynthplus",
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "gpl"
+          ]
+        }
+      ]
+    },
+    "avresample": {
+      "description": "Build the avresample library"
+    },
+    "bzip2": {
+      "description": "Bzip2 support",
+      "dependencies": [
+        "bzip2"
+      ]
+    },
+    "dav1d": {
+      "description": "AV1 decoding via libdav1d",
+      "dependencies": [
+        "dav1d"
+      ]
+    },
+    "fdk-aac": {
+      "description": "AAC de/encoding via libfdk-aac",
+      "dependencies": [
+        "fdk-aac",
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "nonfree"
+          ]
+        }
+      ]
+    },
+    "ffmpeg": {
+      "description": "Build the ffmpeg application",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "avcodec",
+            "avfilter",
+            "avformat"
+          ]
+        }
+      ]
+    },
+    "ffplay": {
+      "description": "Build the ffplay application",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "avcodec",
+            "avfilter",
+            "avformat",
+            "sdl2",
+            "swresample",
+            "swscale"
+          ]
+        }
+      ]
+    },
+    "ffprobe": {
+      "description": "Build the ffprobe application",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "avcodec",
+            "avformat"
+          ]
+        }
+      ]
+    },
+    "fontconfig": {
+      "description": "Useful for drawtext filter",
+      "dependencies": [
+        "fontconfig"
+      ]
+    },
+    "freetype": {
+      "description": "Needed for drawtext filter",
+      "dependencies": [
+        "freetype"
+      ]
+    },
+    "fribidi": {
+      "description": "Improves drawtext filter",
+      "dependencies": [
+        "fribidi"
+      ]
+    },
+    "gpl": {
+      "description": "Allow use of GPL code, the resulting libs and binaries will be under GPL"
+    },
+    "iconv": {
+      "description": "Iconv support",
+      "dependencies": [
+        "libiconv"
+      ]
+    },
+    "ilbc": {
+      "description": "iLBC de/encoding via libilbc",
+      "dependencies": [
+        "libilbc"
+      ]
+    },
+    "lzma": {
+      "description": "lzma support",
+      "dependencies": [
+        "liblzma"
+      ]
+    },
+    "modplug": {
+      "description": "ModPlug via libmodplug",
+      "dependencies": [
+        "libmodplug"
+      ]
+    },
+    "mp3lame": {
+      "description": "MP3 encoding via libmp3lame",
+      "dependencies": [
+        "mp3lame"
+      ]
+    },
+    "nonfree": {
+      "description": "Allow use of nonfree code, the resulting libs and binaries will be unredistributable"
+    },
+    "nvcodec": {
+      "description": "Nvidia video decoding/encoding acceleration",
+      "dependencies": [
+        "ffnvcodec"
+      ]
+    },
+    "opencl": {
+      "description": "OpenCL processing",
+      "dependencies": [
+        "opencl"
+      ]
+    },
+    "opengl": {
+      "description": "OpenGL rendering",
+      "dependencies": [
+        "opengl",
+        "opengl-registry"
+      ]
+    },
+    "openh264": {
+      "description": "H.264 de/encoding via openh264",
+      "dependencies": [
+        "openh264"
+      ]
+    },
+    "openjpeg": {
+      "description": "JPEG 2000 de/encoding via OpenJPEG",
+      "dependencies": [
+        "openjpeg"
+      ]
+    },
+    "openssl": {
+      "description": "Needed for https support if gnutls, libtls or mbedtls is not used",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "nonfree"
+          ]
+        },
+        "openssl"
+      ]
+    },
+    "opus": {
+      "description": "Opus de/encoding via libopus",
+      "dependencies": [
+        "opus"
+      ]
+    },
+    "postproc": {
+      "description": "Build the postproc library",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "gpl"
+          ]
+        }
+      ]
+    },
+    "sdl2": {
+      "description": "Sdl2 support",
+      "dependencies": [
+        "sdl2"
+      ]
+    },
+    "snappy": {
+      "description": "Snappy compression, needed for hap encoding",
+      "dependencies": [
+        "snappy"
+      ]
+    },
+    "soxr": {
+      "description": "Include libsoxr resampling",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "swresample"
+          ]
+        },
+        "soxr"
+      ]
+    },
+    "speex": {
+      "description": "Speex de/encoding via libspeex",
+      "dependencies": [
+        "speex"
+      ]
+    },
+    "ssh": {
+      "description": "SFTP protocol via libssh",
+      "dependencies": [
+        "libssh"
+      ]
+    },
+    "swresample": {
+      "description": "Build the swresample library"
+    },
+    "swscale": {
+      "description": "Build the swscale library"
+    },
+    "tensorflow": {
+      "description": "TensorFlow as a DNN module backend for DNN based filters like sr",
+      "dependencies": [
+        "tensorflow"
+      ]
+    },
+    "tesseract": {
+      "description": "Tesseract, needed for ocr filter",
+      "dependencies": [
+        "tesseract"
+      ]
+    },
+    "theora": {
+      "description": "Theora encoding via libtheora",
+      "dependencies": [
+        "libtheora"
+      ]
+    },
+    "version3": {
+      "description": "Upgrade (L)GPL to version 3"
+    },
+    "vorbis": {
+      "description": "Vorbis en/decoding via libvorbis, native implementation exists",
+      "dependencies": [
+        "libvorbis"
+      ]
+    },
+    "vpx": {
+      "description": "VP8 and VP9 de/encoding via libvpx",
+      "dependencies": [
+        "libvpx"
+      ]
+    },
+    "webp": {
+      "description": "WebP encoding via libwebp",
+      "dependencies": [
+        "libwebp"
+      ]
+    },
+    "x264": {
+      "description": "H.264 encoding via x264",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "gpl"
+          ]
+        },
+        "x264"
+      ]
+    },
+    "x265": {
+      "description": "HEVC encoding via x265",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "gpl"
+          ]
+        },
+        "x265"
+      ]
+    },
+    "xml2": {
+      "description": "XML parsing using the C library libxml2, needed for dash demuxing support",
+      "dependencies": [
+        "libxml2"
+      ]
+    },
+    "zlib": {
+      "description": "zlib support",
+      "dependencies": [
+        "zlib"
+      ]
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index f5918e86d..a8add12b0 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1957,8 +1957,8 @@
       "port-version": 0
     },
     "ffmpeg": {
-      "baseline": "4.3.2",
-      "port-version": 11
+      "baseline": "4.4",
+      "port-version": 0
     },
     "ffnvcodec": {
       "baseline": "10.0.26.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 250729edb..86de96856 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "648aee5015e8d511d44854e1056e4288683935cc",
+      "version-string": "4.4",
+      "port-version": 0
+    },
+    {
       "git-tree": "fe496d461929767f020d5d9e577408ed298febcc",
       "version-string": "4.3.2",
       "port-version": 11