diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 04:17:28 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 04:17:28 +0400 |
commit | f17651bd160d28d3a34c08c7aa537ef86defcc94 (patch) | |
tree | ee86ff9b67a8a1fa21eebe0dea0cf1bdffbf9834 /libavfilter | |
parent | d9d7c54960804262bff36939c8392087aa92a8d0 (diff) | |
parent | 3f14febbdf7c93bbd186399da27991180e5916b6 (diff) |
Merge commit '3f14febbdf7c93bbd186399da27991180e5916b6'
* commit '3f14febbdf7c93bbd186399da27991180e5916b6':
af_channelsplit: switch to an AVOptions-based system.
Conflicts:
libavfilter/af_channelsplit.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/af_channelsplit.c | 7 | ||||
-rw-r--r-- | libavfilter/avfilter.c | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c index ada967e2d4..e87d629642 100644 --- a/libavfilter/af_channelsplit.c +++ b/libavfilter/af_channelsplit.c @@ -55,10 +55,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) - 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); @@ -78,7 +74,6 @@ static int init(AVFilterContext *ctx, const char *arg) } fail: - av_opt_free(s); return ret; } @@ -144,11 +139,11 @@ 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, .inputs = avfilter_af_channelsplit_inputs, .outputs = NULL, - .priv_class = &channelsplit_class, }; diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 632ab4953d..faef796c10 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -668,6 +668,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "boxblur" ) || !strcmp(filter->filter->name, "cellauto") || !strcmp(filter->filter->name, "channelmap") || + !strcmp(filter->filter->name, "channelsplit") || !strcmp(filter->filter->name, "colormatrix") || !strcmp(filter->filter->name, "crop" ) || !strcmp(filter->filter->name, "cropdetect") || |