diff options
author | James Almer <jamrial@gmail.com> | 2017-10-21 15:37:34 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-21 15:37:34 -0300 |
commit | de0b26ce288633846ce3ab4886a25a7e035ee041 (patch) | |
tree | fe7bcfcb1d00f390c69a44f6afd9ad03d9d672e2 | |
parent | 5045cf27aacb3f53f10a465a84e9f52bc95c1594 (diff) | |
parent | 8e18328b18e69b38a5feae5d10ad01b403a205b6 (diff) |
Merge commit '8e18328b18e69b38a5feae5d10ad01b403a205b6'
* commit '8e18328b18e69b38a5feae5d10ad01b403a205b6':
lavfi: Drop deprecated filter registration
Merged-by: James Almer <jamrial@gmail.com>
-rw-r--r-- | libavfilter/avfilter.c | 11 | ||||
-rw-r--r-- | libavfilter/avfilter.h | 18 | ||||
-rw-r--r-- | libavfilter/version.h | 3 |
3 files changed, 0 insertions, 32 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index da0cb791d2..6740cd3755 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -614,17 +614,6 @@ const AVFilter *avfilter_next(const AVFilter *prev) return prev ? prev->next : first_filter; } -#if FF_API_OLD_FILTER_REGISTER -AVFilter **av_filter_next(AVFilter **filter) -{ - return filter ? &(*filter)->next : &first_filter; -} - -void avfilter_uninit(void) -{ -} -#endif - int avfilter_pad_count(const AVFilterPad *pads) { int count; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 2f6b26050e..6be7625676 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -680,12 +680,6 @@ int avfilter_process_command(AVFilterContext *filter, const char *cmd, const cha /** Initialize the filter system. Register all builtin filters. */ void avfilter_register_all(void); -#if FF_API_OLD_FILTER_REGISTER -/** Uninitialize the filter system. Unregister all filters. */ -attribute_deprecated -void avfilter_uninit(void); -#endif - /** * 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 @@ -717,18 +711,6 @@ AVFilter *avfilter_get_by_name(const char *name); */ const AVFilter *avfilter_next(const AVFilter *prev); -#if FF_API_OLD_FILTER_REGISTER -/** - * If filter is NULL, returns a pointer to the first registered filter pointer, - * if filter is non-NULL, returns the next pointer after filter. - * If the returned pointer points to NULL, the last registered filter - * was already reached. - * @deprecated use avfilter_next() - */ -attribute_deprecated -AVFilter **av_filter_next(AVFilter **filter); -#endif - /** * Initialize a filter with the supplied parameters. * diff --git a/libavfilter/version.h b/libavfilter/version.h index 49933e93eb..2d5caa8105 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -52,9 +52,6 @@ #ifndef FF_API_OLD_FILTER_OPTS_ERROR #define FF_API_OLD_FILTER_OPTS_ERROR (LIBAVFILTER_VERSION_MAJOR < 8) #endif -#ifndef FF_API_OLD_FILTER_REGISTER -#define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 7) -#endif #ifndef FF_API_NOCONST_GET_NAME #define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7) #endif |