diff mbox series

[FFmpeg-devel,3/5] avfilter/avfilter: Remove avfilter_link_set_closed() on bump

Message ID 20210307001601.2126517-3-andreas.rheinhardt@gmail.com
State Accepted
Commit fec3c730e6500b7e4ba6444bb23f83230a4996fa
Headers show
Series [FFmpeg-devel,1/5] avcodec/avcodec: Don't suggest calling deprecated avcodec_register_all() | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt March 7, 2021, 12:15 a.m. UTC 
Deprecated in 39a09e995d32d16e4f8c87a6ff5273cb9d98146e.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavfilter/avfilter.c | 3 ++-
 libavfilter/avfilter.h | 4 ++--
 libavfilter/version.h  | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

Comments

Nicolas George March 7, 2021, 10:22 a.m. UTC | #1 
Andreas Rheinhardt (12021-03-07):
> Deprecated in 39a09e995d32d16e4f8c87a6ff5273cb9d98146e.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
>  libavfilter/avfilter.c | 3 ++-
>  libavfilter/avfilter.h | 4 ++--
>  libavfilter/version.h  | 3 +++
>  3 files changed, 7 insertions(+), 3 deletions(-)

Ok.

Regards,
diff mbox series

Patch

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 */