]> git.sesse.net Git - ffmpeg/commitdiff
avfilter/avfilter: Remove avfilter_link_set_closed() on bump
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Sat, 6 Mar 2021 17:02:47 +0000 (18:02 +0100)
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Sun, 7 Mar 2021 14:18:35 +0000 (15:18 +0100)
Deprecated in 39a09e995d32d16e4f8c87a6ff5273cb9d98146e.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/version.h

index d560655f426eb7686c1827bdcfcf0b5777e36150..22ecad5f77acba48eedf9124bc9d7bc1fe37811f 100644 (file)
@@ -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)
 {
index d43b866599de0037f5b1537830ea44c82ef696d7..be1242436ba7cd02d19e6c424652a381eb85d075 100644 (file)
@@ -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.
  *
index ce37b8c60e377420c0b180f4c52dec79f7efdcf2..16e2dced049ded16c2ad54c8349f7035f0d96e40 100644 (file)
@@ -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 */