Skip to content

Update FFCodec structure for ffmpeg 7.1+ #283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cincodenada wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update FFCodec structure for ffmpeg 7.1+ #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9086e3d
Update FFCodec structure for ffmpeg 7
cincodenada May 16, 2026
3d75e1b
Disable libdrm for recent builds
cincodenada May 16, 2026
b554423
Add targets for 7.x releases
cincodenada May 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -99,6 +105,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 :=
Expand Down
2 changes: 2 additions & 0 deletions src/ff_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down