From 3a370868dc33061a20d1fd99274e65167d7a78ac Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 6 Mar 2021 18:08:50 +0100 Subject: [PATCH] avfilter: Remove deprecated avfilter_link_get_channels Deprecated in b2c42fc6dc3502a8b6cae441c54d898972a51cff. Signed-off-by: Andreas Rheinhardt Signed-off-by: James Almer --- libavfilter/avfilter.c | 7 ------- libavfilter/avfilter.h | 8 -------- libavfilter/version.h | 3 --- 3 files changed, 18 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index b3ad8d57b3e..c0453be4de3 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -183,13 +183,6 @@ void avfilter_link_free(AVFilterLink **link) av_freep(link); } -#if FF_API_FILTER_GET_SET -int avfilter_link_get_channels(AVFilterLink *link) -{ - return link->channels; -} -#endif - void ff_filter_set_ready(AVFilterContext *filter, unsigned priority) { filter->ready = FFMAX(filter->ready, priority); diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index b5e092f8bc0..6e4b2464c5c 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -673,14 +673,6 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, */ void avfilter_link_free(AVFilterLink **link); -#if FF_API_FILTER_GET_SET -/** - * Get the number of channels of a link. - * @deprecated Use av_buffersink_get_channels() - */ -attribute_deprecated -int avfilter_link_get_channels(AVFilterLink *link); -#endif #if FF_API_FILTER_LINK_SET_CLOSED /** * Set the closed field of a link. diff --git a/libavfilter/version.h b/libavfilter/version.h index ba9ff5f6332..bbadb00f0dd 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -50,9 +50,6 @@ * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_FILTER_GET_SET -#define FF_API_FILTER_GET_SET (LIBAVFILTER_VERSION_MAJOR < 8) -#endif #ifndef FF_API_SWS_PARAM_OPTION #define FF_API_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 8) #endif -- 2.39.2