diff --git a/Makefile b/Makefile index 345adde..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) @@ -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 := 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,