From 3f14febbdf7c93bbd186399da27991180e5916b6 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 25 Feb 2013 21:21:29 +0100 Subject: [PATCH] af_channelsplit: switch to an AVOptions-based system. --- libavfilter/af_channelsplit.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c index d6110ef909..31e3b0eab7 100644 --- a/libavfilter/af_channelsplit.c +++ b/libavfilter/af_channelsplit.c @@ -59,12 +59,6 @@ static int init(AVFilterContext *ctx, const char *arg) int nb_channels; int ret = 0, i; - s->class = &channelsplit_class; - av_opt_set_defaults(s); - if ((ret = av_set_options_string(s, arg, "=", ":")) < 0) { - av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", arg); - return ret; - } if (!(s->channel_layout = av_get_channel_layout(s->channel_layout_str))) { av_log(ctx, AV_LOG_ERROR, "Error parsing channel layout '%s'.\n", s->channel_layout_str); @@ -84,7 +78,6 @@ static int init(AVFilterContext *ctx, const char *arg) } fail: - av_opt_free(s); return ret; } @@ -149,6 +142,7 @@ AVFilter avfilter_af_channelsplit = { .name = "channelsplit", .description = NULL_IF_CONFIG_SMALL("Split audio into per-channel streams"), .priv_size = sizeof(ChannelSplitContext), + .priv_class = &channelsplit_class, .init = init, .query_formats = query_formats,