History

Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'

* commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da': lavfi: change the filter registering system to match the other libraries Conflicts: cmdutils.c ffplay.c libavfilter/avfilter.c libavfilter/avfilter.h This removes the ability to put AVFilters in read only memory and having them shareable.

Michael Niedermayer committed 13 years ago

Commit 835cc0f2 parents f4db6bf fa2a34c7 files · +52 −34Browse files

Showing the changes to libavfilter/avfilter.h (1 of 7 files). Show all

Unified · Split

libavfilter/avfilter.h+16−0
@@ -496,6 +496,8 @@ typedef struct AVFilter { · 495 unmodified lines
496496
497497 int priv_size; ///< size of private data to allocate for the filter
498498
499+ struct AVFilter *next;
500+
499501 /**
500502 * Make the filter instance process a command.
501503 *
@@ -837,8 +839,11 @@ int avfilter_process_command(AVFilterContext *filter, const char *cmd, const cha · 335 unmodified lines
837839 /** Initialize the filter system. Register all builtin filters. */
838840 void avfilter_register_all(void);
839841
842+#if FF_API_OLD_FILTER_REGISTER
840843 /** Uninitialize the filter system. Unregister all filters. */
844+attribute_deprecated
841845 void avfilter_uninit(void);
846+#endif
842847
843848 /**
844849 * Register a filter. This is only needed if you plan to use
@@ -861,13 +866,24 @@ int avfilter_register(AVFilter *filter); · 16 unmodified lines
861866 */
862867 AVFilter *avfilter_get_by_name(const char *name);
863868
869+/**
870+ * Iterate over all registered filters.
871+ * @return If prev is non-NULL, next registered filter after prev or NULL if
872+ * prev is the last filter. If prev is NULL, return the first registered filter.
873+ */
874+const AVFilter *avfilter_next(const AVFilter *prev);
875+
876+#if FF_API_OLD_FILTER_REGISTER
864877 /**
865878 * If filter is NULL, returns a pointer to the first registered filter pointer,
866879 * if filter is non-NULL, returns the next pointer after filter.
867880 * If the returned pointer points to NULL, the last registered filter
868881 * was already reached.
882+ * @deprecated use avfilter_next()
869883 */
884+attribute_deprecated
870885 AVFilter **av_filter_next(AVFilter **filter);
886+#endif
871887
872888 #if FF_API_AVFILTER_OPEN
873889 /**

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t