aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-03-06 18:02:47 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-03-07 15:18:35 +0100
commitfec3c730e6500b7e4ba6444bb23f83230a4996fa (patch)
tree491e710aa92ad8f7ca63a98fd4f049aac1c5555e
parenta7f841718ff93e3143f218cfdc27d1764024b0eb (diff)
downloadffmpeg-fec3c730e6500b7e4ba6444bb23f83230a4996fa.tar.gz
avfilter/avfilter: Remove avfilter_link_set_closed() on bump
Deprecated in 39a09e995d32d16e4f8c87a6ff5273cb9d98146e. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r--libavfilter/avfilter.c3
-rw-r--r--libavfilter/avfilter.h4
-rw-r--r--libavfilter/version.h3
3 files changed, 7 insertions, 3 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index d560655f42..22ecad5f77 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -232,11 +232,12 @@ void ff_avfilter_link_set_out_status(AVFilterLink *link, int status, int64_t pts
ff_filter_set_ready(link->src, 200);
}
+#if FF_API_FILTER_LINK_SET_CLOSED
void avfilter_link_set_closed(AVFilterLink *link, int closed)
{
ff_avfilter_link_set_out_status(link, closed ? AVERROR_EOF : 0, AV_NOPTS_VALUE);
}
-
+#endif
int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt,
unsigned filt_srcpad_idx, unsigned filt_dstpad_idx)
{
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index d43b866599..be1242436b 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -681,7 +681,7 @@ void avfilter_link_free(AVFilterLink **link);
attribute_deprecated
int avfilter_link_get_channels(AVFilterLink *link);
#endif
-
+#if FF_API_FILTER_LINK_SET_CLOSED
/**
* Set the closed field of a link.
* @deprecated applications are not supposed to mess with links, they should
@@ -689,7 +689,7 @@ int avfilter_link_get_channels(AVFilterLink *link);
*/
attribute_deprecated
void avfilter_link_set_closed(AVFilterLink *link, int closed);
-
+#endif
/**
* Negotiate the media format, dimensions, etc of all inputs to a filter.
*
diff --git a/libavfilter/version.h b/libavfilter/version.h
index ce37b8c60e..16e2dced04 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -65,5 +65,8 @@
#ifndef FF_API_NEXT
#define FF_API_NEXT (LIBAVFILTER_VERSION_MAJOR < 8)
#endif
+#ifndef FF_API_FILTER_LINK_SET_CLOSED
+#define FF_API_FILTER_LINK_SET_CLOSED (LIBAVFILTER_VERSION_MAJOR < 8)
+#endif
#endif /* AVFILTER_VERSION_H */