diff --git a/extra/ffmpeg/.SRCINFO b/extra/ffmpeg/.SRCINFO
index 79ce63841..0b4978f3d 100644
--- a/extra/ffmpeg/.SRCINFO
+++ b/extra/ffmpeg/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ffmpeg
 	pkgdesc = Complete solution to record, convert and stream audio and video
 	pkgver = 6.1
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 2
 	url = https://ffmpeg.org/
 	arch = x86_64
@@ -10,6 +10,7 @@ pkgbase = ffmpeg
 	makedepends = avisynthplus
 	makedepends = clang
 	makedepends = ffnvcodec-headers
+	makedepends = frei0r-plugins
 	makedepends = git
 	makedepends = ladspa
 	makedepends = mesa
@@ -19,8 +20,11 @@ pkgbase = ffmpeg
 	depends = alsa-lib
 	depends = aom
 	depends = bzip2
+	depends = cairo
 	depends = fontconfig
 	depends = fribidi
+	depends = glib2
+	depends = glibc
 	depends = gmp
 	depends = gnutls
 	depends = gsm
@@ -34,14 +38,17 @@ pkgbase = ffmpeg
 	depends = libdrm
 	depends = libfreetype.so
 	depends = libgl
+	depends = libharfbuzz.so
 	depends = libiec61883
 	depends = libjxl.so
 	depends = libmodplug
 	depends = libopenmpt.so
+	depends = libplacebo.so
 	depends = libpulse
 	depends = librav1e.so
 	depends = libraw1394
 	depends = librsvg-2.so
+	depends = librubberband.so
 	depends = libsoxr
 	depends = libssh
 	depends = libtheora
@@ -69,6 +76,7 @@ pkgbase = ffmpeg
 	depends = openjpeg2
 	depends = opus
 	depends = sdl2
+	depends = snappy
 	depends = speex
 	depends = srt
 	depends = svt-av1
@@ -78,10 +86,11 @@ pkgbase = ffmpeg
 	depends = xz
 	depends = zlib
 	optdepends = avisynthplus: AviSynthPlus support
+	optdepends = frei0r-plugins: Frei0r video effects support
 	optdepends = intel-media-sdk: Intel QuickSync support (legacy)
-	optdepends = onevpl-intel-gpu: Intel QuickSync support
 	optdepends = ladspa: LADSPA filters
 	optdepends = nvidia-utils: Nvidia NVDEC/NVENC support
+	optdepends = onevpl-intel-gpu: Intel QuickSync support
 	provides = libavcodec.so
 	provides = libavdevice.so
 	provides = libavfilter.so
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 5f70e459b..946645d02 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -17,7 +17,7 @@
 
 pkgname=ffmpeg
 pkgver=6.1
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc='Complete solution to record, convert and stream audio and video'
 arch=(x86_64)
@@ -26,8 +26,11 @@ license=(GPL3)
 depends=(
   alsa-lib
   bzip2
+  cairo
   fontconfig
   fribidi
+  glib2
+  glibc
   gmp
   gnutls
   gsm
@@ -40,13 +43,16 @@ depends=(
   libdav1d.so
   libdrm
   libfreetype.so
+  libharfbuzz.so
   libgl
   libiec61883
   libjxl.so
   libmodplug
+  libplacebo.so
   libopenmpt.so
   libpulse
   libraw1394
+  librubberband.so
   librsvg-2.so
   libsoxr
   libssh
@@ -73,6 +79,7 @@ depends=(
   opencore-amr
   openjpeg2
   opus
+  snappy
   sdl2
   speex
   srt
@@ -85,6 +92,7 @@ makedepends=(
   amf-headers
   avisynthplus
   clang
+  frei0r-plugins
   git
   ladspa
   mesa
@@ -94,6 +102,7 @@ makedepends=(
 )
 optdepends=(
   'avisynthplus: AviSynthPlus support'
+  'frei0r-plugins: Frei0r video effects support'
   'ladspa: LADSPA filters'
 )
 provides=(
@@ -128,6 +137,11 @@ prepare() {
   # use non-deprecated nvenc GUID for conftest
   git cherry-pick -n 03823ac0c6a38bd6ba972539e3203a592579792f
   git cherry-pick -n d2b46c1ef768bc31ba9180f6d469d5b8be677500
+  # Fix VDPAU vo
+  git cherry-pick -n e9c93009fc34ca9dfcf0c6f2ed90ef1df298abf7
+  # Fix bug in av_fft_end
+  git cherry-pick -n a562cfee2e214252f8b3f516527272ae32ef9532
+  git cherry-pick -n 250471ea1745fc703eb346a2a662304536a311b1
 }
 
 pkgver() {
@@ -148,6 +162,7 @@ build() {
     --enable-avisynth \
     --enable-cuda-llvm \
     --enable-fontconfig \
+    --enable-frei0r \
     --enable-gmp \
     --enable-gnutls \
     --enable-gpl \
@@ -160,6 +175,7 @@ build() {
     --enable-libfreetype \
     --enable-libfribidi \
     --enable-libgsm \
+    --enable-libharfbuzz \
     --enable-libiec61883 \
     --enable-libjack \
     --enable-libjxl \
@@ -170,8 +186,11 @@ build() {
     --enable-libopenjpeg \
     --enable-libopenmpt \
     --enable-libopus \
+    --enable-libplacebo \
     --enable-libpulse \
     --enable-librsvg \
+    --enable-librubberband \
+    --enable-libsnappy \
     --enable-libsoxr \
     --enable-libspeex \
     --enable-libsrt \