From 04924bc923efeb55e76a8bd6867da6fb2db724dd Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 12 Apr 2013 10:55:46 +0200 Subject: avfilter: remove old shorthand system Signed-off-by: Michael Niedermayer --- libavfilter/avfilter.c | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 6c76c89ab3..871ab49c7a 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -681,21 +681,6 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, return count; } -// TODO: drop me -static const char *const filters_left_to_update[] = { -#if FF_API_ACONVERT_FILTER - "aconvert", -#endif -}; - -static int filter_use_deprecated_init(const char *name) -{ - int i; - for (i = 0; i < FF_ARRAY_ELEMS(filters_left_to_update); i++) - if (!strcmp(name, filters_left_to_update[i])) - return 1; - return 0; -} #if 0 #if FF_API_AVFILTER_INIT_FILTER int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque) @@ -717,22 +702,8 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque AVDictionary *options = NULL; AVDictionaryEntry *e; int ret=0; - int deprecated_init = filter_use_deprecated_init(filter->filter->name); - - // TODO: remove old shorthand - if (filter->filter->shorthand) { - av_assert0(filter->priv); - av_assert0(filter->filter->priv_class); - *(const AVClass **)filter->priv = filter->filter->priv_class; - av_opt_set_defaults(filter->priv); - ret = av_opt_set_from_string(filter->priv, args, - filter->filter->shorthand, "=", ":"); - if (ret < 0) - return ret; - args = NULL; - } - if (!deprecated_init && args && *args) { + if (args && *args) { if (!filter->filter->priv_class) { av_log(filter, AV_LOG_ERROR, "This filter does not take any " "options, but options were provided: %s.\n", args); @@ -858,7 +829,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque } } - if (!deprecated_init && filter->filter->priv_class) { + if (filter->filter->priv_class) { ret = av_opt_set_dict(filter->priv, &options); if (ret < 0) { av_log(filter, AV_LOG_ERROR, "Error applying options to the filter.\n"); -- cgit v1.2.3