avfilter: Remove avfilter_next/avfilter_register API

Deprecated in 8f1382f80e0d4184c54c14afdda6482f050fbba7.

Andreas Rheinhardt committed 5 years ago

Commit ec82ff81 parent 3a370863 files · +0 −76Browse files

Unified · Split

3 files

libavfilter/allfilters.c +0 −38
libavfilter/avfilter.h +0 −35
libavfilter/version.h +0 −3

@@ -557,41 +557,3 @@ const AVFilter avfilter_get_by_name(const char name) · 556 unmodified lines
557		557
558	return NULL;	558	return NULL;
559	}	559	}
560
561
562	#if FF_API_NEXT
563	FF_DISABLE_DEPRECATION_WARNINGS
564	static AVOnce av_filter_next_init = AV_ONCE_INIT;
565
566	static void av_filter_init_next(void)
567	{
568	AVFilter prev = NULL, p;
569	void *i = 0;
570	while ((p = (AVFilter*)av_filter_iterate(&i))) {
571	if (prev)
572	prev->next = p;
573	prev = p;
574	}
575	}
576
577	void avfilter_register_all(void)
578	{
579	ff_thread_once(&av_filter_next_init, av_filter_init_next);
580	}
581
582	int avfilter_register(AVFilter *filter)
583	{
584	ff_thread_once(&av_filter_next_init, av_filter_init_next);
585
586	return 0;
587	}
588
589	const AVFilter avfilter_next(const AVFilter prev)
590	{
591	ff_thread_once(&av_filter_next_init, av_filter_init_next);
592
593	return prev ? prev->next : filter_list[0];
594	}
595
596	FF_ENABLE_DEPRECATION_WARNINGS
597	#endif

libavfilter/avfilter.h+0−35

@@ -286,14 +286,6 @@ typedef struct AVFilter { · 285 unmodified lines
286		286
287	int flags_internal; ///< Additional flags for avfilter internal use only.	287	int flags_internal; ///< Additional flags for avfilter internal use only.
288		288
289	#if FF_API_NEXT
290	/**
291	* Used by the filter registration system. Must not be touched by any other
292	* code.
293	*/
294	struct AVFilter *next;
295	#endif
296
297	/**	289	/**
298	* Make the filter instance process a command.	290	* Make the filter instance process a command.
299	*	291	*
@@ -710,33 +702,6 @@ int avfilter_process_command(AVFilterContext filter, const char cmd, const cha · 410 unmodified lines
710	*/	702	*/
711	const AVFilter av_filter_iterate(void *opaque);	703	const AVFilter av_filter_iterate(void *opaque);
712		704
713	#if FF_API_NEXT
714	/** Initialize the filter system. Register all builtin filters. */
715	attribute_deprecated
716	void avfilter_register_all(void);
717
718	/**
719	* Register a filter. This is only needed if you plan to use
720	* avfilter_get_by_name later to lookup the AVFilter structure by name. A
721	* filter can still by instantiated with avfilter_graph_alloc_filter even if it
722	* is not registered.
723	*
724	* @param filter the filter to register
725	* @return 0 if the registration was successful, a negative value
726	* otherwise
727	*/
728	attribute_deprecated
729	int avfilter_register(AVFilter *filter);
730
731	/**
732	* Iterate over all registered filters.
733	* @return If prev is non-NULL, next registered filter after prev or NULL if
734	* prev is the last filter. If prev is NULL, return the first registered filter.
735	*/
736	attribute_deprecated
737	const AVFilter avfilter_next(const AVFilter prev);
738	#endif
739
740	/**	705	/**
741	* Get a filter definition matching the given name.	706	* Get a filter definition matching the given name.
742	*	707	*

libavfilter/version.h+0−3

 #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

avfilter: Remove avfilter_next/avfilter_register API

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code