From 59c0301be9ac3ecb07616d49e946b562746c95a8 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 6 Mar 2021 18:23:43 +0100 Subject: [PATCH] avfilter/buffersink: Postpone removal of av_[a]buffersink_params_alloc They have been deprecated in 61097535cdaa91fea0d62c567b3af02a940f6c2d, yet this was less than two years ago. Removing them will therefore have to wait. Reviewed-by: Nicolas George Signed-off-by: Andreas Rheinhardt --- libavfilter/buffersink.c | 2 +- libavfilter/buffersink.h | 2 +- libavfilter/version.h | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 58848941d4..15d897cff6 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -148,7 +148,7 @@ int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx, return get_frame_internal(ctx, frame, 0, nb_samples); } -#if FF_API_NEXT +#if FF_API_BUFFERSINK_ALLOC AVBufferSinkParams *av_buffersink_params_alloc(void) { static const int pixel_fmts[] = { AV_PIX_FMT_NONE }; diff --git a/libavfilter/buffersink.h b/libavfilter/buffersink.h index 65d0cca747..69ed0f29a8 100644 --- a/libavfilter/buffersink.h +++ b/libavfilter/buffersink.h @@ -95,7 +95,7 @@ int av_buffersink_get_frame_flags(AVFilterContext *ctx, AVFrame *frame, int flag */ #define AV_BUFFERSINK_FLAG_NO_REQUEST 2 -#if FF_API_NEXT +#if FF_API_BUFFERSINK_ALLOC /** * Deprecated and unused struct to use for initializing a buffersink context. */ diff --git a/libavfilter/version.h b/libavfilter/version.h index 16e2dced04..e28a6566cb 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -68,5 +68,8 @@ #ifndef FF_API_FILTER_LINK_SET_CLOSED #define FF_API_FILTER_LINK_SET_CLOSED (LIBAVFILTER_VERSION_MAJOR < 8) #endif +#ifndef FF_API_BUFFERSINK_ALLOC +#define FF_API_BUFFERSINK_ALLOC (LIBAVFILTER_VERSION_MAJOR < 9) +#endif #endif /* AVFILTER_VERSION_H */