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 <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>

diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index 58848941d4819145121ed6fff5111a345d34538d..15d897cff6628869fe4d225538c73dd90e7f6fa7 100644 (file)
--- 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 65d0cca7479bb5b11a9a50cfa5410d7306ca4fe4..69ed0f29a88f4880d7042b974006e53ed08f4be7 100644 (file)
--- 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 16e2dced049ded16c2ad54c8349f7035f0d96e40..e28a6566cb2a3d74ed6b2246c6e4a5a65527193b 100644 (file)
--- 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 */