From 9086e3d5f3d3bd31c7d36c2f93d582a00116fe0f Mon Sep 17 00:00:00 2001 From: Ell Bradshaw Date: Fri, 15 May 2026 21:59:55 -0700 Subject: [PATCH 1/3] Update FFCodec structure for ffmpeg 7 A field was removed above the union, which broke things quite a bit. There wasn't an internal version change for this, so there are a handful of commits that this will still break against, but it should be fine against all release versions. Specifically, the internal version was bumped to 13 in this ffmpeg commit: 3305767560 commit 2024-04-03 - avcodec: add avcodec_get_supported_config() And init_static_data was actually removed here: 4524d527bf avcodec/codec_internal: nuke init_static_data() --- src/ff_internal.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ff_internal.h b/src/ff_internal.h index 40765a1..f858fd4 100644 --- a/src/ff_internal.h +++ b/src/ff_internal.h @@ -18,7 +18,9 @@ typedef struct FFCodec { int (*update_thread_context_for_user)(struct AVCodecContext *dst, const struct AVCodecContext *src); const FFCodecDefault *defaults; +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(61, 13, 100) void (*init_static_data)(struct FFCodec *codec); +#endif int (*init)(struct AVCodecContext *); union { int (*decode)(struct AVCodecContext *avctx, struct AVFrame *frame, From 3d75e1b08ca3dd0d8be096dfb37c7d5fa5f26981 Mon Sep 17 00:00:00 2001 From: Ell Bradshaw Date: Fri, 15 May 2026 22:19:54 -0700 Subject: [PATCH 2/3] Disable libdrm for recent builds It was throwing errors, and it doesn't seem like we need it --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 345adde..ad7002b 100644 --- a/Makefile +++ b/Makefile @@ -99,6 +99,8 @@ ifneq ($(FF_VER), shared) FF_MAJOR_VER := $(word 1, $(subst ., ,$(FF_VER))) ifeq ($(shell test $(FF_MAJOR_VER) -lt 4; echo $$?),0) EXTRA_FF_OPTS := --disable-vda + else ifeq ($(shell test $(FF_MAJOR_VER) -gt 6; echo $$?),0) + EXTRA_FF_OPTS := --disable-libdrm endif else EXTRA_FF_OPTS := From b554423e31d18b1e59d22470e81e1677a27d0b28 Mon Sep 17 00:00:00 2001 From: Ell Bradshaw Date: Fri, 15 May 2026 22:20:47 -0700 Subject: [PATCH 3/3] Add targets for 7.x releases --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index ad7002b..936c75e 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,12 @@ else ifeq ($(TARGET), $(_EXE)-41) else ifeq ($(TARGET), $(_EXE)-60) FF_VER := 6.0 EXE := $(TARGET) +else ifeq ($(TARGET), $(_EXE)-70) + FF_VER := 7.0 + EXE := $(TARGET) +else ifeq ($(TARGET), $(_EXE)-71) + FF_VER := 7.1 + EXE := $(TARGET) endif ifeq ($(OS),Windows_NT)