Unified · Split
| @@ -390,6 +390,8 @@ static const AVOption stack_options[] = { · 389 unmodified lines | |||
| 390 | { NULL }, | 390 | { NULL }, |
| 391 | }; | 391 | }; |
| 392 | 392 | ||
| 393 | AVFILTER_DEFINE_CLASS_EXT(stack, "(h|v)stack", stack_options); | ||
| 394 | |||
| 393 | static const AVFilterPad outputs[] = { | 395 | static const AVFilterPad outputs[] = { |
| 394 | { | 396 | { |
| 395 | .name = "default", | 397 | .name = "default", |
| @@ -400,14 +402,11 @@ static const AVFilterPad outputs[] = { · 4 unmodified lines | |||
| 400 | 402 | ||
| 401 | #if CONFIG_HSTACK_FILTER | 403 | #if CONFIG_HSTACK_FILTER |
| 402 | 404 | ||
| 403 | #define hstack_options stack_options | ||
| 404 | AVFILTER_DEFINE_CLASS(hstack); | ||
| 405 | |||
| 406 | const AVFilter ff_vf_hstack = { | 405 | const AVFilter ff_vf_hstack = { |
| 407 | .name = "hstack", | 406 | .name = "hstack", |
| 408 | .description = NULL_IF_CONFIG_SMALL("Stack video inputs horizontally."), | 407 | .description = NULL_IF_CONFIG_SMALL("Stack video inputs horizontally."), |
| 408 | .priv_class = &stack_class, | ||
| 409 | .priv_size = sizeof(StackContext), | 409 | .priv_size = sizeof(StackContext), |
| 410 | .priv_class = &hstack_class, | ||
| 411 | .query_formats = query_formats, | 410 | .query_formats = query_formats, |
| 412 | FILTER_OUTPUTS(outputs), | 411 | FILTER_OUTPUTS(outputs), |
| 413 | .init = init, | 412 | .init = init, |
| @@ -420,14 +419,11 @@ const AVFilter ff_vf_hstack = { · 6 unmodified lines | |||
| 420 | 419 | ||
| 421 | #if CONFIG_VSTACK_FILTER | 420 | #if CONFIG_VSTACK_FILTER |
| 422 | 421 | ||
| 423 | #define vstack_options stack_options | ||
| 424 | AVFILTER_DEFINE_CLASS(vstack); | ||
| 425 | |||
| 426 | const AVFilter ff_vf_vstack = { | 422 | const AVFilter ff_vf_vstack = { |
| 427 | .name = "vstack", | 423 | .name = "vstack", |
| 428 | .description = NULL_IF_CONFIG_SMALL("Stack video inputs vertically."), | 424 | .description = NULL_IF_CONFIG_SMALL("Stack video inputs vertically."), |
| 425 | .priv_class = &stack_class, | ||
| 429 | .priv_size = sizeof(StackContext), | 426 | .priv_size = sizeof(StackContext), |
| 430 | .priv_class = &vstack_class, | ||
| 431 | .query_formats = query_formats, | 427 | .query_formats = query_formats, |
| 432 | FILTER_OUTPUTS(outputs), | 428 | FILTER_OUTPUTS(outputs), |
| 433 | .init = init, | 429 | .init = init, |