Commit 3f14febb authored by Anton Khirnov's avatar Anton Khirnov

af_channelsplit: switch to an AVOptions-based system.

parent ba8efac9
...@@ -59,12 +59,6 @@ static int init(AVFilterContext *ctx, const char *arg) ...@@ -59,12 +59,6 @@ static int init(AVFilterContext *ctx, const char *arg)
int nb_channels; int nb_channels;
int ret = 0, i; 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))) { if (!(s->channel_layout = av_get_channel_layout(s->channel_layout_str))) {
av_log(ctx, AV_LOG_ERROR, "Error parsing channel layout '%s'.\n", av_log(ctx, AV_LOG_ERROR, "Error parsing channel layout '%s'.\n",
s->channel_layout_str); s->channel_layout_str);
...@@ -84,7 +78,6 @@ static int init(AVFilterContext *ctx, const char *arg) ...@@ -84,7 +78,6 @@ static int init(AVFilterContext *ctx, const char *arg)
} }
fail: fail:
av_opt_free(s);
return ret; return ret;
} }
...@@ -149,6 +142,7 @@ AVFilter avfilter_af_channelsplit = { ...@@ -149,6 +142,7 @@ AVFilter avfilter_af_channelsplit = {
.name = "channelsplit", .name = "channelsplit",
.description = NULL_IF_CONFIG_SMALL("Split audio into per-channel streams"), .description = NULL_IF_CONFIG_SMALL("Split audio into per-channel streams"),
.priv_size = sizeof(ChannelSplitContext), .priv_size = sizeof(ChannelSplitContext),
.priv_class = &channelsplit_class,
.init = init, .init = init,
.query_formats = query_formats, .query_formats = query_formats,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment