diff --git a/contrib/src/ffmpeg/SHA512SUMS b/contrib/src/ffmpeg/SHA512SUMS
index 2edb6f011c5032a83c45146998df40258b04b9d7..e99f69fdb15674c0c501cc26c4f3fa82ce71ac9b 100644
--- a/contrib/src/ffmpeg/SHA512SUMS
+++ b/contrib/src/ffmpeg/SHA512SUMS
@@ -1,5 +1,2 @@
-ifdef HAVE_DARWIN_OS
-df0393b9dbee05f64f80ff98512ec153c78ccca9f8ea170301703cd0b92fb68c91c8113ab8a2ecb161ac465544edefe29dd1965e6959694f8728fee529606665 ffmpeg-n4.2.2.tar.gz
-else
-b00ca3b77e9c9a4ee69a50283471bf136c1a35a837982aa886e9c50c546e48a6b5ea2acd1e183990eefe6c32fb1d5504684925abb7d8fa4f80b7e53864647c6c ffmpeg-n4.3.tar.gz
-endif
+2c2e32ea0bd483a7c8dc3bb7dffa93419defd1d7be3724fe51e981bc13f5ee00f5d93d5d07c1fe62e944493c2319048ec2546bead50af89da3d6b2a67f3008ee ffmpeg-9f38fac053010205806ece11e6aea9b7d3bde041.tar.gz
+df0393b9dbee05f64f80ff98512ec153c78ccca9f8ea170301703cd0b92fb68c91c8113ab8a2ecb161ac465544edefe29dd1965e6959694f8728fee529606665 ffmpeg-n4.2.2.tar.gz
\ No newline at end of file
diff --git a/contrib/src/ffmpeg/package.json b/contrib/src/ffmpeg/package.json
index e15e5ea23fef3ae32c42949c0df9e5aa283b5cdc..425667800591ea9a5f53079c3f838b024972d45b 100644
--- a/contrib/src/ffmpeg/package.json
+++ b/contrib/src/ffmpeg/package.json
@@ -1,6 +1,6 @@
{
"name": "ffmpeg",
- "version": "59da9dcd7ef6277e4e04998ced71b05a6083c635",
+ "version": "9f38fac053010205806ece11e6aea9b7d3bde041",
"url": "https://github.com/FFmpeg/FFmpeg/archive/__VERSION__.tar.gz",
"deps": [
"vpx",
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index b138d35a1647fc86739e8d51de9334272afe19d4..505cef935f702c1291e67edeba5b92fa5795a014 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -1,9 +1,8 @@
ifdef HAVE_DARWIN_OS
FFMPEG_HASH := n4.2.2
else
-FFMPEG_HASH := n4.3
+FFMPEG_HASH := 9f38fac053010205806ece11e6aea9b7d3bde041
endif
-
FFMPEG_URL := https://git.ffmpeg.org/gitweb/ffmpeg.git/snapshot/$(FFMPEG_HASH).tar.gz
PKGS+=ffmpeg
diff --git a/contrib/src/ffmpeg/windows-configure-ffnvcodec.patch b/contrib/src/ffmpeg/windows-configure-ffnvcodec.patch
index 78a69c28abe42be8e6c0d688324ed4ffc35cb588..a946f176c55fa5c513932fc8c2a466717704ae93 100644
--- a/contrib/src/ffmpeg/windows-configure-ffnvcodec.patch
+++ b/contrib/src/ffmpeg/windows-configure-ffnvcodec.patch
@@ -1,6 +1,6 @@
-From f84107def60c4cd3dcbbcd66eaec9e934a0f6467 Mon Sep 17 00:00:00 2001
-From: Eden Abitbol <eden.abitbol@savoirfairelinux.com>
-Date: Tue, 27 Aug 2019 12:05:38 -0400
+From 4bb07a5a8306e27a430d6d62c7b7e23300d594a3 Mon Sep 17 00:00:00 2001
+From: Pierre Lespagnol <pierre.lespagnol@savoirfairelinux.com>
+Date: Fri, 29 Jan 2021 16:52:01 -0500
Subject: [PATCH] windows ffnvcodec patch
---
@@ -9,21 +9,21 @@ Subject: [PATCH] windows ffnvcodec patch
--- a/configure
+++ b/configure
-@@ -6107,14 +6107,6 @@ else
+@@ -6246,14 +6246,6 @@ else
check_nvcc cuda_llvm
fi
-if ! disabled ffnvcodec; then
- ffnv_hdr_list="ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h"
-- check_pkg_config ffnvcodec "ffnvcodec >= 9.0.18.0" "$ffnv_hdr_list" "" || \
-- check_pkg_config ffnvcodec "ffnvcodec >= 8.2.15.8 ffnvcodec < 8.3" "$ffnv_hdr_list" "" || \
-- check_pkg_config ffnvcodec "ffnvcodec >= 8.1.24.9 ffnvcodec < 8.2" "$ffnv_hdr_list" "" || \
-- check_pkg_config ffnvcodec "ffnvcodec >= 8.0.14.9 ffnvcodec < 8.1" "$ffnv_hdr_list" ""
+- check_pkg_config ffnvcodec "ffnvcodec >= 9.1.23.1" "$ffnv_hdr_list" "" || \
+- check_pkg_config ffnvcodec "ffnvcodec >= 9.0.18.3 ffnvcodec < 9.1" "$ffnv_hdr_list" "" || \
+- check_pkg_config ffnvcodec "ffnvcodec >= 8.2.15.10 ffnvcodec < 8.3" "$ffnv_hdr_list" "" || \
+- check_pkg_config ffnvcodec "ffnvcodec >= 8.1.24.11 ffnvcodec < 8.2" "$ffnv_hdr_list" ""
-fi
-
check_cpp_condition winrt windows.h "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)"
if ! disabled w32threads && ! enabled pthreads; then
--
-2.22.0.windows.1
+2.27.0
diff --git a/contrib/src/ffmpeg/windows-configure-libmfx.patch b/contrib/src/ffmpeg/windows-configure-libmfx.patch
index c2d86e9a45602f98932eb5ce845d143b8e456c8c..bd7f63c0888071cebbb53c77ff8433d6bf35f376 100644
--- a/contrib/src/ffmpeg/windows-configure-libmfx.patch
+++ b/contrib/src/ffmpeg/windows-configure-libmfx.patch
@@ -1,6 +1,6 @@
-From f7e11c47904c43ada3821e7771229945c08a2080 Mon Sep 17 00:00:00 2001
-From: Eden Abitbol <eden.abitbol@savoirfairelinux.com>
-Date: Tue, 27 Aug 2019 12:07:02 -0400
+From d8378480c349c5c4e30ca89fa68695661103c309 Mon Sep 17 00:00:00 2001
+From: Pierre Lespagnol <pierre.lespagnol@savoirfairelinux.com>
+Date: Fri, 29 Jan 2021 16:56:48 -0500
Subject: [PATCH] windows libmfx patch
---
@@ -9,15 +9,19 @@ Subject: [PATCH] windows libmfx patch
--- a/configure
+++ b/configure
-@@ -6225,8 +6225,6 @@ enabled liblensfun && require_pkg_config liblensfun lensfun lensfun.h lf_
+@@ -6374,12 +6374,6 @@ enabled liblensfun && require_pkg_config liblensfun lensfun lensfun.h lf_
# Media SDK or Intel Media Server Studio, these don't come with
# pkg-config support. Instead, users should make sure that the build
# can find the libraries and headers through other means.
-enabled libmfx && { check_pkg_config libmfx libmfx "mfx/mfxvideo.h" MFXInit ||
- { require libmfx "mfx/mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } }
+-if enabled libmfx; then
+- check_cc MFX_CODEC_VP9 "mfx/mfxvp9.h mfx/mfxstructures.h" "MFX_CODEC_VP9"
+-fi
+-
enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load
enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs
- enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_load ||
+ enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine ||
--
-2.22.0.windows.1
+2.27.0
diff --git a/contrib/src/ffmpeg/windows-configure.patch b/contrib/src/ffmpeg/windows-configure.patch
index 3ff8308b86b7ac653dce4ffb9d751235a01768d5..427a5d7daf4d032edadb4c5bacff6e539b126ef2 100644
--- a/contrib/src/ffmpeg/windows-configure.patch
+++ b/contrib/src/ffmpeg/windows-configure.patch
@@ -1,6 +1,6 @@
-From 737a77c1399d5f8fdab5b913b5e6b43f6ec73751 Mon Sep 17 00:00:00 2001
-From: Eden Abitbol <eden.abitbol@savoirfairelinux.com>
-Date: Tue, 27 Aug 2019 12:00:41 -0400
+From 1d10f0603d85336efef694036c884b1743572e1e Mon Sep 17 00:00:00 2001
+From: Pierre Lespagnol <pierre.lespagnol@savoirfairelinux.com>
+Date: Fri, 29 Jan 2021 16:08:55 -0500
Subject: [PATCH] windows configure patch
---
@@ -9,7 +9,7 @@ Subject: [PATCH] windows configure patch
--- a/configure
+++ b/configure
-@@ -1569,7 +1569,7 @@ require_cpp_condition(){
+@@ -1578,7 +1578,7 @@ require_cpp_condition(){
require_pkg_config(){
log require_pkg_config "$@"
pkg_version="$2"
@@ -18,7 +18,7 @@ Subject: [PATCH] windows configure patch
}
test_host_cc(){
-@@ -6286,28 +6286,6 @@ enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_in
+@@ -6436,28 +6436,6 @@ enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_in
enabled libvorbis && require_pkg_config libvorbis vorbis vorbis/codec.h vorbis_info_init &&
require_pkg_config libvorbisenc vorbisenc vorbis/vorbisenc.h vorbis_encode_init
@@ -44,10 +44,10 @@ Subject: [PATCH] windows configure patch
- fi
-}
-
- enabled libwavpack && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput -lwavpack
enabled libwebp && {
enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion
-@@ -6973,17 +6951,6 @@ flatten_extralibs_wrapper(){
+ enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; }
+@@ -7140,17 +7118,6 @@ flatten_extralibs_wrapper(){
eval printf \''%s'\' \""\$$list_name"\"
}
@@ -66,5 +66,4 @@ Subject: [PATCH] windows configure patch
eval ${linkunit}_extralibs=\$\(flatten_extralibs_wrapper ${linkunit}_extralibs\)
done
--
-2.22.0.windows.1
-
+2.27.0
\ No newline at end of file