* 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.
Showing the changes to libavfilter/avfilter.h (1 of 7 files). Show all
Unified · Split
| @@ -496,6 +496,8 @@ typedef struct AVFilter { · 495 unmodified lines | ||
| 496 | 496 | |
| 497 | 497 | int priv_size; ///< size of private data to allocate for the filter |
| 498 | 498 | |
| 499 | + struct AVFilter *next; | |
| 500 | + | |
| 499 | 501 | /** |
| 500 | 502 | * Make the filter instance process a command. |
| 501 | 503 | * |
| @@ -837,8 +839,11 @@ int avfilter_process_command(AVFilterContext *filter, const char *cmd, const cha · 335 unmodified lines | ||
| 837 | 839 | /** Initialize the filter system. Register all builtin filters. */ |
| 838 | 840 | void avfilter_register_all(void); |
| 839 | 841 | |
| 842 | +#if FF_API_OLD_FILTER_REGISTER | |
| 840 | 843 | /** Uninitialize the filter system. Unregister all filters. */ |
| 844 | +attribute_deprecated | |
| 841 | 845 | void avfilter_uninit(void); |
| 846 | +#endif | |
| 842 | 847 | |
| 843 | 848 | /** |
| 844 | 849 | * Register a filter. This is only needed if you plan to use |
| @@ -861,13 +866,24 @@ int avfilter_register(AVFilter *filter); · 16 unmodified lines | ||
| 861 | 866 | */ |
| 862 | 867 | AVFilter *avfilter_get_by_name(const char *name); |
| 863 | 868 | |
| 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 | |
| 864 | 877 | /** |
| 865 | 878 | * If filter is NULL, returns a pointer to the first registered filter pointer, |
| 866 | 879 | * if filter is non-NULL, returns the next pointer after filter. |
| 867 | 880 | * If the returned pointer points to NULL, the last registered filter |
| 868 | 881 | * was already reached. |
| 882 | + * @deprecated use avfilter_next() | |
| 869 | 883 | */ |
| 884 | +attribute_deprecated | |
| 870 | 885 | AVFilter **av_filter_next(AVFilter **filter); |
| 886 | +#endif | |
| 871 | 887 | |
| 872 | 888 | #if FF_API_AVFILTER_OPEN |
| 873 | 889 | /** |