har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '52067b3c0e5ddbcf7021a093420798420351a9e2'

Browse Source 
* commit '52067b3c0e5ddbcf7021a093420798420351a9e2':
  lavfi: Drop deprecated filter initialization

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

7
libavfilter/avfilter.c
View File

@ -931,13 +931,6 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options,
return count; return count;
} }
#if FF_API_AVFILTER_INIT_FILTER
int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque)
{
return avfilter_init_str(filter, args);
}
#endif
int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options) int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options)
{ {
int ret = 0; int ret = 0;

15
libavfilter/avfilter.h
View File

@ -729,21 +729,6 @@ attribute_deprecated
AVFilter **av_filter_next(AVFilter **filter); AVFilter **av_filter_next(AVFilter **filter);
#endif #endif
#if FF_API_AVFILTER_INIT_FILTER
/**
* Initialize a filter.
*
* @param filter the filter to initialize
* @param args A string of parameters to use when initializing the filter.
* The format and meaning of this string varies by filter.
* @param opaque Any extra non-string data needed by the filter. The meaning
* of this parameter varies by filter.
* @return zero on success
*/
attribute_deprecated
int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque);
#endif
/** /**
* Initialize a filter with the supplied parameters. * Initialize a filter with the supplied parameters.
* *

3
libavfilter/version.h
View File

@ -52,9 +52,6 @@
#ifndef FF_API_OLD_FILTER_OPTS_ERROR #ifndef FF_API_OLD_FILTER_OPTS_ERROR
#define FF_API_OLD_FILTER_OPTS_ERROR (LIBAVFILTER_VERSION_MAJOR < 8) #define FF_API_OLD_FILTER_OPTS_ERROR (LIBAVFILTER_VERSION_MAJOR < 8)
#endif #endif
#ifndef FF_API_AVFILTER_INIT_FILTER
#define FF_API_AVFILTER_INIT_FILTER (LIBAVFILTER_VERSION_MAJOR < 7)
#endif
#ifndef FF_API_OLD_FILTER_REGISTER #ifndef FF_API_OLD_FILTER_REGISTER
#define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 7) #define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 7)
#endif #endif