Unified · Split
| @@ -86,6 +86,8 @@ static const AVOption options[] = { · 85 unmodified lines | |||
| 86 | { NULL } | 86 | { NULL } |
| 87 | }; | 87 | }; |
| 88 | 88 | ||
| 89 | AVFILTER_DEFINE_CLASS_EXT(agate_sidechaingate, "agate/sidechaingate", options); | ||
| 90 | |||
| 89 | static int agate_config_input(AVFilterLink *inlink) | 91 | static int agate_config_input(AVFilterLink *inlink) |
| 90 | { | 92 | { |
| 91 | AVFilterContext *ctx = inlink->dst; | 93 | AVFilterContext *ctx = inlink->dst; |
| @@ -183,9 +185,6 @@ static void gate(AudioGateContext *s, · 91 unmodified lines | |||
| 183 | 185 | ||
| 184 | #if CONFIG_AGATE_FILTER | 186 | #if CONFIG_AGATE_FILTER |
| 185 | 187 | ||
| 186 | #define agate_options options | ||
| 187 | AVFILTER_DEFINE_CLASS(agate); | ||
| 188 | |||
| 189 | static int query_formats(AVFilterContext *ctx) | 188 | static int query_formats(AVFilterContext *ctx) |
| 190 | { | 189 | { |
| 191 | AVFilterFormats *formats = NULL; | 190 | AVFilterFormats *formats = NULL; |
| @@ -252,9 +251,9 @@ static const AVFilterPad outputs[] = { · 60 unmodified lines | |||
| 252 | const AVFilter ff_af_agate = { | 251 | const AVFilter ff_af_agate = { |
| 253 | .name = "agate", | 252 | .name = "agate", |
| 254 | .description = NULL_IF_CONFIG_SMALL("Audio gate."), | 253 | .description = NULL_IF_CONFIG_SMALL("Audio gate."), |
| 254 | .priv_class = &agate_sidechaingate_class, | ||
| 255 | .query_formats = query_formats, | 255 | .query_formats = query_formats, |
| 256 | .priv_size = sizeof(AudioGateContext), | 256 | .priv_size = sizeof(AudioGateContext), |
| 257 | .priv_class = &agate_class, | ||
| 258 | FILTER_INPUTS(inputs), | 257 | FILTER_INPUTS(inputs), |
| 259 | FILTER_OUTPUTS(outputs), | 258 | FILTER_OUTPUTS(outputs), |
| 260 | .process_command = ff_filter_process_command, | 259 | .process_command = ff_filter_process_command, |
| @@ -265,9 +264,6 @@ const AVFilter ff_af_agate = { · 4 unmodified lines | |||
| 265 | 264 | ||
| 266 | #if CONFIG_SIDECHAINGATE_FILTER | 265 | #if CONFIG_SIDECHAINGATE_FILTER |
| 267 | 266 | ||
| 268 | #define sidechaingate_options options | ||
| 269 | AVFILTER_DEFINE_CLASS(sidechaingate); | ||
| 270 | |||
| 271 | static int activate(AVFilterContext *ctx) | 267 | static int activate(AVFilterContext *ctx) |
| 272 | { | 268 | { |
| 273 | AudioGateContext *s = ctx->priv; | 269 | AudioGateContext *s = ctx->priv; |
| @@ -424,8 +420,8 @@ static const AVFilterPad sidechaingate_outputs[] = { · 150 unmodified lines | |||
| 424 | const AVFilter ff_af_sidechaingate = { | 420 | const AVFilter ff_af_sidechaingate = { |
| 425 | .name = "sidechaingate", | 421 | .name = "sidechaingate", |
| 426 | .description = NULL_IF_CONFIG_SMALL("Audio sidechain gate."), | 422 | .description = NULL_IF_CONFIG_SMALL("Audio sidechain gate."), |
| 423 | .priv_class = &agate_sidechaingate_class, | ||
| 427 | .priv_size = sizeof(AudioGateContext), | 424 | .priv_size = sizeof(AudioGateContext), |
| 428 | .priv_class = &sidechaingate_class, | ||
| 429 | .query_formats = scquery_formats, | 425 | .query_formats = scquery_formats, |
| 430 | .activate = activate, | 426 | .activate = activate, |
| 431 | .uninit = uninit, | 427 | .uninit = uninit, |