Unified · Split
| @@ -63,18 +63,22 @@ typedef struct StackContext { · 62 unmodified lines | ||
| 63 | 63 | FFFrameSync fs; |
| 64 | 64 | } StackContext; |
| 65 | 65 | |
| 66 | −static int query_formats(AVFilterContext *ctx) | |
| 66 | +static int query_formats(const AVFilterContext *ctx, | |
| 67 | + AVFilterFormatsConfig **cfg_in, | |
| 68 | + AVFilterFormatsConfig **cfg_out) | |
| 67 | 69 | { |
| 68 | − StackContext *s = ctx->priv; | |
| 70 | + const StackContext *s = ctx->priv; | |
| 69 | 71 | int reject_flags = AV_PIX_FMT_FLAG_BITSTREAM | |
| 70 | 72 | AV_PIX_FMT_FLAG_HWACCEL | |
| 71 | 73 | AV_PIX_FMT_FLAG_PAL; |
| 72 | 74 | |
| 73 | 75 | if (s->fillcolor_enable) { |
| 74 | − return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); | |
| 76 | + return ff_set_common_formats2(ctx, cfg_in, cfg_out, | |
| 77 | + ff_draw_supported_pixel_formats(0)); | |
| 75 | 78 | } |
| 76 | 79 | |
| 77 | − return ff_set_common_formats(ctx, ff_formats_pixdesc_filter(0, reject_flags)); | |
| 80 | + return ff_set_common_formats2(ctx, cfg_in, cfg_out, | |
| 81 | + ff_formats_pixdesc_filter(0, reject_flags)); | |
| 78 | 82 | } |
| 79 | 83 | |
| 80 | 84 | static av_cold int init(AVFilterContext *ctx) |
| @@ -462,7 +466,7 @@ const AVFilter ff_vf_hstack = { · 381 unmodified lines | ||
| 462 | 466 | .priv_class = &stack_class, |
| 463 | 467 | .priv_size = sizeof(StackContext), |
| 464 | 468 | FILTER_OUTPUTS(outputs), |
| 465 | − FILTER_QUERY_FUNC(query_formats), | |
| 469 | + FILTER_QUERY_FUNC2(query_formats), | |
| 466 | 470 | .init = init, |
| 467 | 471 | .uninit = uninit, |
| 468 | 472 | .activate = activate, |
| @@ -479,7 +483,7 @@ const AVFilter ff_vf_vstack = { · 10 unmodified lines | ||
| 479 | 483 | .priv_class = &stack_class, |
| 480 | 484 | .priv_size = sizeof(StackContext), |
| 481 | 485 | FILTER_OUTPUTS(outputs), |
| 482 | − FILTER_QUERY_FUNC(query_formats), | |
| 486 | + FILTER_QUERY_FUNC2(query_formats), | |
| 483 | 487 | .init = init, |
| 484 | 488 | .uninit = uninit, |
| 485 | 489 | .activate = activate, |
| @@ -507,7 +511,7 @@ const AVFilter ff_vf_xstack = { · 21 unmodified lines | ||
| 507 | 511 | .priv_size = sizeof(StackContext), |
| 508 | 512 | .priv_class = &xstack_class, |
| 509 | 513 | FILTER_OUTPUTS(outputs), |
| 510 | − FILTER_QUERY_FUNC(query_formats), | |
| 514 | + FILTER_QUERY_FUNC2(query_formats), | |
| 511 | 515 | .init = init, |
| 512 | 516 | .uninit = uninit, |
| 513 | 517 | .activate = activate, |