From 52067b3c0e5ddbcf7021a093420798420351a9e2 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Mon, 5 Dec 2016 12:43:19 -0500 Subject: [PATCH] lavfi: Drop deprecated filter initialization Deprecated in 03/2013. --- libavfilter/avfilter.c | 7 ------- libavfilter/avfilter.h | 15 --------------- libavfilter/version.h | 3 --- 3 files changed, 25 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index d6bddef4a0..439eee4dd4 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -561,13 +561,6 @@ static int process_unnamed_options(AVFilterContext *ctx, AVDictionary **options, return 0; } -#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 babcec66f2..6537a83407 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -479,21 +479,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 540ac48f9b..ef2b34cc6f 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -49,9 +49,6 @@ * the public API and may change, break or disappear at any time. */ -#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