lavfi: Drop deprecated filter registration

Deprecated in 04/2013.

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 439eee4dd460d1fc3de93fef64c2b6ec7c30b930..3ae7a591db2c0928a39d80a2b6818efb1b4b130e 100644 (file)
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -324,17 +324,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 6537a83407f092c164e5a38e828f55d80de111a1..96d3e318637f162a9d5721f75773a44914ef1ea6 100644 (file)
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -430,12 +430,6 @@ int avfilter_config_links(AVFilterContext *filter);
 /** 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
@@ -467,18 +461,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 ef2b34cc6f7c58412852442479cb6c55ce58eda2..4f3da2bd106c262858eb6d42739ed5ef5119e5c0 100644 (file)
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -49,9 +49,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#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