diff -ur multimedia/ffmpeg.orig/Makefile multimedia/ffmpeg/Makefile
--- multimedia/ffmpeg.orig/Makefile
+++ multimedia/ffmpeg/Makefile
@@ -7,9 +7,6 @@
 CATEGORIES=	multimedia audio net
 MASTER_SITES=	https://ffmpeg.org/releases/
 
-PATCH_SITES=		${SVTHEVC_PATCH_SITES_} ${SVTAV1_PATCH_SITES_} ${SVTVP9_PATCH_SITES_}
-PATCHFILES=		${SVTHEVC_PATCHFILES_}  ${SVTAV1_PATCHFILES_}  ${SVTVP9_PATCHFILES_}
-
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Realtime audio/video encoder/converter and streaming server
 
@@ -456,8 +453,8 @@
 # svt-av1
 SVTAV1_LIB_DEPENDS=	libSvtAv1Enc.so:multimedia/svt-av1
 SVTAV1_CONFIGURE_ENABLE=	libsvtav1
-SVTAV1_PATCH_SITES_=	https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.8.4/ffmpeg_plugin/:svtav1
-SVTAV1_PATCHFILES_=	0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch:-p1:svtav1
+SVTAV1_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.8.4/ffmpeg_plugin/:svtav1
+SVTAV1_PATCHFILES=	0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch:-p1:svtav1
 .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
 # https://github.com/OpenVisualCloud/SVT-AV1/issues/691
 SVTAV1_LDFLAGS=		-fuse-ld=lld
@@ -466,8 +463,8 @@
 # svt-hevc
 SVTHEVC_LIB_DEPENDS=	libSvtHevcEnc.so:multimedia/svt-hevc
 SVTHEVC_CONFIGURE_ENABLE=	libsvthevc
-SVTHEVC_PATCH_SITES_=	https://github.com/Intel/SVT-HEVC/raw/v1.4.3/ffmpeg_plugin/:svthevc
-SVTHEVC_PATCHFILES_=	0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \
+SVTHEVC_PATCH_SITES=	https://github.com/Intel/SVT-HEVC/raw/v1.4.3/ffmpeg_plugin/:svthevc
+SVTHEVC_PATCHFILES=	0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \
 			0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc
 .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
 SVTHEVC_LDFLAGS=	-fuse-ld=lld
@@ -476,9 +473,8 @@
 # svt-vp9
 SVTVP9_LIB_DEPENDS=	libSvtVp9Enc.so:multimedia/svt-vp9
 SVTVP9_CONFIGURE_ENABLE=	libsvtvp9
-SVTVP9_PATCH_SITES_=	https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.2.1/ffmpeg_plugin/:svtvp9
-SVTVP9_PATCHFILES_=	master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9
-SVTVP9_BROKEN=		https://github.com/OpenVisualCloud/SVT-VP9/issues/124
+SVTVP9_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.2.2/ffmpeg_plugin/:svtvp9
+SVTVP9_PATCHFILES=	master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9
 .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
 SVTVP9_LDFLAGS=		-fuse-ld=lld
 .endif
diff -ur multimedia/ffmpeg.orig/distinfo multimedia/ffmpeg/distinfo
--- multimedia/ffmpeg.orig/distinfo
+++ multimedia/ffmpeg/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1594463972
+TIMESTAMP = 1595399140
 SHA256 (ffmpeg-4.3.1.tar.xz) = ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb
 SIZE (ffmpeg-4.3.1.tar.xz) = 9379424
+SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 5e960b4dab495437082d0838a40a8cae9b67d1cef1ffd57da960afaa2bfd3719
+SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 25023
 SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6
 SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 22103
 SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
 SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5332
-SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 5e960b4dab495437082d0838a40a8cae9b67d1cef1ffd57da960afaa2bfd3719
-SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 25023
-SHA256 (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = c730545fef90e37b033f7bd42de6351b4a1b475247b23c15bda5bc8be54904cb
-SIZE (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 33249
+SHA256 (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = b74be6d805672210e226e7c0b403f88b0ee8a53c732c9bdc873c4b44aeb75c96
+SIZE (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 33465