[FFmpeg-cvslog] avfilter/avfilter: Remove avfilter_link_set_closed() on bump
Andreas Rheinhardt
git at videolan.org
Sun Mar 7 16:20:06 EET 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sat Mar 6 18:02:47 2021 +0100| [fec3c730e6500b7e4ba6444bb23f83230a4996fa] | committer: Andreas Rheinhardt
avfilter/avfilter: Remove avfilter_link_set_closed() on bump
Deprecated in 39a09e995d32d16e4f8c87a6ff5273cb9d98146e.
Reviewed-by: Nicolas George <george at nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fec3c730e6500b7e4ba6444bb23f83230a4996fa
---
libavfilter/avfilter.c | 3 ++-
libavfilter/avfilter.h | 4 ++--
libavfilter/version.h | 3 +++
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 */
More information about the ffmpeg-cvslog
mailing list