diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-21 15:35:14 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-21 15:35:14 -0300 |
| commit | 5045cf27aacb3f53f10a465a84e9f52bc95c1594 (patch) | |
| tree | 33a9b8343c13bd8949539b7960c3343849559a49 | |
| parent | 7c4f63d05b3393d1034e1edc2266440e33925100 (diff) | |
| parent | 52067b3c0e5ddbcf7021a093420798420351a9e2 (diff) | |
| download | ffmpeg-5045cf27aacb3f53f10a465a84e9f52bc95c1594.tar.gz | |
Merge commit '52067b3c0e5ddbcf7021a093420798420351a9e2'
* commit '52067b3c0e5ddbcf7021a093420798420351a9e2':
lavfi: Drop deprecated filter initialization
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavfilter/avfilter.c | 7 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 15 | ||||
| -rw-r--r-- | libavfilter/version.h | 3 |
3 files changed, 0 insertions, 25 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 07c35d7dda..da0cb791d2 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -931,13 +931,6 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, 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 ret = 0; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 3d7bd33215..2f6b26050e 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -729,21 +729,6 @@ attribute_deprecated AVFilter **av_filter_next(AVFilter **filter); #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. * diff --git a/libavfilter/version.h b/libavfilter/version.h index ad2178241e..49933e93eb 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -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_AVFILTER_INIT_FILTER -#define FF_API_AVFILTER_INIT_FILTER (LIBAVFILTER_VERSION_MAJOR < 7) -#endif #ifndef FF_API_OLD_FILTER_REGISTER #define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 7) #endif |