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