diff --git a/multimedia/ffmpeg/Config.in b/multimedia/ffmpeg/Config.in
index 574ba27830..c4a3571437 100644
--- a/multimedia/ffmpeg/Config.in
+++ b/multimedia/ffmpeg/Config.in
@@ -83,7 +83,7 @@ config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT
 	select FFMPEG_CUSTOM_DECODER_amrnb
 	select FFMPEG_CUSTOM_DECODER_amrwb
 	select FFMPEG_CUSTOM_DECODER_ape
-	select FFMPEG_CUSTOM_DECODER_atrac3 if (BUILD_PATENTED)
+	select FFMPEG_CUSTOM_DECODER_atrac3
 	select FFMPEG_CUSTOM_DECODER_flac
 	select FFMPEG_CUSTOM_DECODER_mp2
 	select FFMPEG_CUSTOM_DECODER_mp3
@@ -220,7 +220,6 @@ config FFMPEG_CUSTOM_DECODER_ape
 
 config FFMPEG_CUSTOM_DECODER_atrac3
 	bool "ATRAC3"
-	depends on FFMPEG_CUSTOM_PATENTED
 
 config FFMPEG_CUSTOM_DECODER_flac
 	bool "FLAC"
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index ca6e057fbe..a95fe3930d 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
-PKG_VERSION:=6.1.3
+PKG_VERSION:=6.1.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://ffmpeg.org/releases/
-PKG_HASH:=bc5f1e4a4d283a6492354684ee1124129c52293bcfc6a9169193539fbece3487
+PKG_HASH:=a231e3d5742c44b1cdaebfb98ad7b6200d12763e0b6db9e1e2c5891f2c083a18
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
 		Ian Leonard <antonlacon@gmail.com>
 
@@ -201,7 +201,6 @@ FFMPEG_AUDIO_PROTOCOLS:= \
 	file http icecast rtp tcp udp
 
 FFMPEG_PATENTED_DECODERS:= \
-	atrac3 \
 	h264 \
 	hevc \
 	vc1 \
@@ -385,7 +384,7 @@ REAL_CPU_TYPE:=$(call qstrip,$(firstword $(subst +, ,$(CONFIG_CPU_TYPE))))
 REAL_CPU_TYPE:=$(subst octeonplus,octeon+,$(REAL_CPU_TYPE))
 
 FFMPEG_CONFIGURE:= \
-	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(FPIC) -Wno-error=incompatible-pointer-types" \
+	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(FPIC)" \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	./configure \
 	--enable-cross-compile \
diff --git a/multimedia/ffmpeg/patches/100-avcodec-tableprint_vlc-Unbreak-hardcoded-tables.patch b/multimedia/ffmpeg/patches/100-avcodec-tableprint_vlc-Unbreak-hardcoded-tables.patch
new file mode 100644
index 0000000000..5e25f343f0
--- /dev/null
+++ b/multimedia/ffmpeg/patches/100-avcodec-tableprint_vlc-Unbreak-hardcoded-tables.patch
@@ -0,0 +1,24 @@
+From 1d47ae65bf6df91246cbe25c997b25947f7a4d1d Mon Sep 17 00:00:00 2001
+From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
+Date: Thu, 4 Dec 2025 18:42:02 +0100
+Subject: [PATCH] avcodec/tableprint_vlc: Unbreak hardcoded tables
+
+Forgotten in d8ffec5bf9a2803f55cc0822a97b7815f24bee83.
+Fixes issue #21102.
+
+Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
+---
+ libavcodec/tableprint_vlc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libavcodec/tableprint_vlc.h
++++ b/libavcodec/tableprint_vlc.h
+@@ -27,7 +27,7 @@
+ #define av_log(a, ...) while(0)
+ #define ff_dlog(a, ...) while(0)
+ #define AVUTIL_MEM_H
+-#define av_malloc(s) NULL
++#define av_mallocz(s) NULL
+ #define av_malloc_array(a, b) NULL
+ #define av_realloc_f(p, o, n) NULL
+ #define av_free(p) while(0)