History

lavfi/vf_overlay_qsv: switch to query_func2()

Anton Khirnov committed 2 years ago

Commit 64035fe1 parent 0c86bc31 file · +6 −4Browse files

Unified · Split

libavfilter/vf_overlay_qsv.c+6−4
@@ -366,7 +366,9 @@ static int activate(AVFilterContext *ctx) · 365 unmodified lines
366 return ff_framesync_activate(&s->fs);366 return ff_framesync_activate(&s->fs);
367}367}
368 368
369static int overlay_qsv_query_formats(AVFilterContext *ctx)369static int overlay_qsv_query_formats(const AVFilterContext *ctx,
370 AVFilterFormatsConfig **cfg_in,
371 AVFilterFormatsConfig **cfg_out)
370{372{
371 int i;373 int i;
372 int ret;374 int ret;
@@ -386,12 +388,12 @@ static int overlay_qsv_query_formats(AVFilterContext *ctx) · 13 unmodified lines
386 };388 };
387 389
388 for (i = 0; i < ctx->nb_inputs; i++) {390 for (i = 0; i < ctx->nb_inputs; i++) {
389 ret = ff_formats_ref(ff_make_format_list(main_in_fmts), &ctx->inputs[i]->outcfg.formats);391 ret = ff_formats_ref(ff_make_format_list(main_in_fmts), &cfg_in[i]->formats);
390 if (ret < 0)392 if (ret < 0)
391 return ret;393 return ret;
392 }394 }
393 395
394 ret = ff_formats_ref(ff_make_format_list(out_pix_fmts), &ctx->outputs[0]->incfg.formats);396 ret = ff_formats_ref(ff_make_format_list(out_pix_fmts), &cfg_out[0]->formats);
395 if (ret < 0)397 if (ret < 0)
396 return ret;398 return ret;
397 399
@@ -431,7 +433,7 @@ const AVFilter ff_vf_overlay_qsv = { · 33 unmodified lines
431 .activate = activate,433 .activate = activate,
432 FILTER_INPUTS(overlay_qsv_inputs),434 FILTER_INPUTS(overlay_qsv_inputs),
433 FILTER_OUTPUTS(overlay_qsv_outputs),435 FILTER_OUTPUTS(overlay_qsv_outputs),
434 FILTER_QUERY_FUNC(overlay_qsv_query_formats),436 FILTER_QUERY_FUNC2(overlay_qsv_query_formats),
435 .priv_class = &overlay_qsv_class,437 .priv_class = &overlay_qsv_class,
436 .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,438 .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
437 .flags = AVFILTER_FLAG_HWDEVICE,439 .flags = AVFILTER_FLAG_HWDEVICE,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t