virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '8e18328b18e69b38a5feae5d10ad01b403a205b6'

Browse Source 
* commit '8e18328b18e69b38a5feae5d10ad01b403a205b6':
  lavfi: Drop deprecated filter registration

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-21 15:37:34 -03:00
commit de0b26ce28
3 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavfilter/avfilter.c
View File

@ -614,17 +614,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;

18
libavfilter/avfilter.h
View File

@ -680,12 +680,6 @@ 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
* avfilter_get_by_name later to lookup the AVFilter structure by name. A
@ -717,18 +711,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.
*

3
libavfilter/version.h
View File

@ -52,9 +52,6 @@
#ifndef FF_API_OLD_FILTER_OPTS_ERROR
#define FF_API_OLD_FILTER_OPTS_ERROR (LIBAVFILTER_VERSION_MAJOR < 8)
#endif
#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