diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 15:01:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 15:08:40 +0200 |
| commit | 835cc0f2e7098fbb548d7622110c4fdc0831809d (patch) | |
| tree | 22408566623b068dd3eb0ab2a49751fb1ecde67d /libavfilter/avfilter.h | |
| parent | f4db6bfeb86feda2aeb98072e55b55de85ba0962 (diff) | |
| parent | fa2a34cd40d124161c748bb0f430dc63c94dd0da (diff) | |
| download | ffmpeg-835cc0f2e7098fbb548d7622110c4fdc0831809d.tar.gz | |
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.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.h')
| -rw-r--r-- | libavfilter/avfilter.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 4bc97554fe..44143b010a 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -496,6 +496,8 @@ typedef struct AVFilter { int priv_size; ///< size of private data to allocate for the filter + struct AVFilter *next; + /** * Make the filter instance process a command. * @@ -837,8 +839,11 @@ 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 @@ -862,12 +867,23 @@ int avfilter_register(AVFilter *filter); AVFilter *avfilter_get_by_name(const char *name); /** + * Iterate over all registered filters. + * @return If prev is non-NULL, next registered filter after prev or NULL if + * prev is the last filter. If prev is NULL, return the first registered filter. + */ +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 #if FF_API_AVFILTER_OPEN /** |