Unified · Split
| @@ -64,7 +64,9 @@ typedef struct MixContext { · 63 unmodified lines | |||
| 64 | FFFrameSync fs; | 64 | FFFrameSync fs; |
| 65 | } MixContext; | 65 | } MixContext; |
| 66 | 66 | ||
| 67 | static int query_formats(AVFilterContext *ctx) | 67 | static int query_formats(const AVFilterContext *ctx, |
| 68 | AVFilterFormatsConfig **cfg_in, | ||
| 69 | AVFilterFormatsConfig **cfg_out) | ||
| 68 | { | 70 | { |
| 69 | unsigned reject_flags = AV_PIX_FMT_FLAG_BITSTREAM | | 71 | unsigned reject_flags = AV_PIX_FMT_FLAG_BITSTREAM | |
| 70 | AV_PIX_FMT_FLAG_HWACCEL | | 72 | AV_PIX_FMT_FLAG_HWACCEL | |
| @@ -76,7 +78,8 @@ static int query_formats(AVFilterContext *ctx) · 5 unmodified lines | |||
| 76 | else | 78 | else |
| 77 | accept_flags |= AV_PIX_FMT_FLAG_BE; | 79 | accept_flags |= AV_PIX_FMT_FLAG_BE; |
| 78 | 80 | ||
| 79 | return ff_set_common_formats(ctx, ff_formats_pixdesc_filter(accept_flags, reject_flags)); | 81 | return ff_set_common_formats2(ctx, cfg_in, cfg_out, |
| 82 | ff_formats_pixdesc_filter(accept_flags, reject_flags)); | ||
| 80 | } | 83 | } |
| 81 | 84 | ||
| 82 | static int parse_weights(AVFilterContext *ctx) | 85 | static int parse_weights(AVFilterContext *ctx) |
| @@ -462,7 +465,7 @@ const AVFilter ff_vf_mix = { · 379 unmodified lines | |||
| 462 | .priv_size = sizeof(MixContext), | 465 | .priv_size = sizeof(MixContext), |
| 463 | .priv_class = &mix_class, | 466 | .priv_class = &mix_class, |
| 464 | FILTER_OUTPUTS(outputs), | 467 | FILTER_OUTPUTS(outputs), |
| 465 | FILTER_QUERY_FUNC(query_formats), | 468 | FILTER_QUERY_FUNC2(query_formats), |
| 466 | .init = init, | 469 | .init = init, |
| 467 | .uninit = uninit, | 470 | .uninit = uninit, |
| 468 | .activate = activate, | 471 | .activate = activate, |
| @@ -547,7 +550,7 @@ const AVFilter ff_vf_tmix = { · 78 unmodified lines | |||
| 547 | .priv_class = &tmix_class, | 550 | .priv_class = &tmix_class, |
| 548 | FILTER_OUTPUTS(outputs), | 551 | FILTER_OUTPUTS(outputs), |
| 549 | FILTER_INPUTS(inputs), | 552 | FILTER_INPUTS(inputs), |
| 550 | FILTER_QUERY_FUNC(query_formats), | 553 | FILTER_QUERY_FUNC2(query_formats), |
| 551 | .init = init, | 554 | .init = init, |
| 552 | .uninit = uninit, | 555 | .uninit = uninit, |
| 553 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, | 556 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, |