diff options
| author | Niklas Haas <git@haasn.dev> | 2025-02-19 18:20:11 +0100 |
|---|---|---|
| committer | Niklas Haas <git@haasn.dev> | 2025-02-27 18:56:49 +0100 |
| commit | 6602b88df688a0697f93517028cdbec3e7c4d7c9 (patch) | |
| tree | 25541b6dbeba13055afbec7f1848d5059ded50d9 | |
| parent | 05302767ac2b14f560f70d0a3e99de151b3e9539 (diff) | |
| download | ffmpeg-6602b88df688a0697f93517028cdbec3e7c4d7c9.tar.gz | |
avfilter/vf_libplacebo: switch to new background API
Fixes a deprecation warning, and also fixes a bug where the depredated
skip_target_clearing option was not correctly mapped to the new API inside
libplacebo upstream.
Signed-off-by: Niklas Haas <git@haasn.dev>
Sponsored-by: nxtedition
| -rw-r--r-- | libavfilter/vf_libplacebo.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index f457564afa..6254951e0a 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -892,8 +892,12 @@ static int output_frame(AVFilterContext *ctx, int64_t pts) } /* Draw first frame opaque, others with blending */ - opts->params.skip_target_clearing = false; opts->params.blend_params = NULL; +#if PL_API_VER >= 346 + opts->params.background = opts->params.border = PL_CLEAR_COLOR; +#else + opts->params.skip_target_clearing = false; +#endif for (int i = 0; i < s->nb_inputs; i++) { LibplaceboInput *in = &s->inputs[i]; FilterLink *il = ff_filter_link(ctx->inputs[in->idx]); @@ -904,8 +908,12 @@ static int output_frame(AVFilterContext *ctx, int64_t pts) opts->params.skip_caching_single_frame = high_fps; update_crops(ctx, in, &target, out->pts * av_q2d(outlink->time_base)); pl_render_image_mix(in->renderer, &in->mix, &target, &opts->params); - opts->params.skip_target_clearing = true; opts->params.blend_params = &pl_alpha_overlay; +#if PL_API_VER >= 346 + opts->params.background = opts->params.border = PL_CLEAR_SKIP; +#else + opts->params.skip_target_clearing = true; +#endif } if (outdesc->flags & AV_PIX_FMT_FLAG_HWACCEL) { |