[FFmpeg-cvslog] avfilter: Remove avfilter_next/avfilter_register API
Andreas Rheinhardt
git at videolan.org
Wed Apr 28 00:15:58 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sat Mar 6 18:44:21 2021 +0100| [ec82ff89b600fbe67723f5b22661f0a4e67924ab] | committer: James Almer
avfilter: Remove avfilter_next/avfilter_register API
Deprecated in 8f1382f80e0d4184c54c14afdda6482f050fbba7.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec82ff89b600fbe67723f5b22661f0a4e67924ab
---
libavfilter/allfilters.c | 38 --------------------------------------
libavfilter/avfilter.h | 35 -----------------------------------
libavfilter/version.h | 3 ---
3 files changed, 76 deletions(-)
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index 0d2bf7bbee..7dbd1fb1dd 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -557,41 +557,3 @@ const AVFilter *avfilter_get_by_name(const char *name)
return NULL;
}
-
-
-#if FF_API_NEXT
-FF_DISABLE_DEPRECATION_WARNINGS
-static AVOnce av_filter_next_init = AV_ONCE_INIT;
-
-static void av_filter_init_next(void)
-{
- AVFilter *prev = NULL, *p;
- void *i = 0;
- while ((p = (AVFilter*)av_filter_iterate(&i))) {
- if (prev)
- prev->next = p;
- prev = p;
- }
-}
-
-void avfilter_register_all(void)
-{
- ff_thread_once(&av_filter_next_init, av_filter_init_next);
-}
-
-int avfilter_register(AVFilter *filter)
-{
- ff_thread_once(&av_filter_next_init, av_filter_init_next);
-
- return 0;
-}
-
-const AVFilter *avfilter_next(const AVFilter *prev)
-{
- ff_thread_once(&av_filter_next_init, av_filter_init_next);
-
- return prev ? prev->next : filter_list[0];
-}
-
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 6e4b2464c5..54fa656b01 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -286,14 +286,6 @@ typedef struct AVFilter {
int flags_internal; ///< Additional flags for avfilter internal use only.
-#if FF_API_NEXT
- /**
- * Used by the filter registration system. Must not be touched by any other
- * code.
- */
- struct AVFilter *next;
-#endif
-
/**
* Make the filter instance process a command.
*
@@ -710,33 +702,6 @@ int avfilter_process_command(AVFilterContext *filter, const char *cmd, const cha
*/
const AVFilter *av_filter_iterate(void **opaque);
-#if FF_API_NEXT
-/** Initialize the filter system. Register all builtin filters. */
-attribute_deprecated
-void avfilter_register_all(void);
-
-/**
- * Register a filter. This is only needed if you plan to use
- * avfilter_get_by_name later to lookup the AVFilter structure by name. A
- * filter can still by instantiated with avfilter_graph_alloc_filter even if it
- * is not registered.
- *
- * @param filter the filter to register
- * @return 0 if the registration was successful, a negative value
- * otherwise
- */
-attribute_deprecated
-int avfilter_register(AVFilter *filter);
-
-/**
- * Iterate over all registered filters.
- * @return If prev is non-NULL, next registered filter after prev or NULL if
- * prev is the last filter. If prev is NULL, return the first registered filter.
- */
-attribute_deprecated
-const AVFilter *avfilter_next(const AVFilter *prev);
-#endif
-
/**
* Get a filter definition matching the given name.
*
diff --git a/libavfilter/version.h b/libavfilter/version.h
index bbadb00f0d..68923e4bd4 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -53,9 +53,6 @@
#ifndef FF_API_SWS_PARAM_OPTION
#define FF_API_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 8)
#endif
-#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
More information about the ffmpeg-cvslog
mailing list