History

avfilter/vf_blend: Deduplicate outputs

Andreas Rheinhardt committed 3 years ago

Commit 2e2c2811 parent 1d33a311 file · +9 −17Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/vf_blend.c+9−17
@@ -378,6 +378,14 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar · 377 unmodified lines
378 return config_params(ctx);378 return config_params(ctx);
379}379}
380 380
381static const AVFilterPad blend_outputs[] = {
382 {
383 .name = "default",
384 .type = AVMEDIA_TYPE_VIDEO,
385 .config_props = config_output,
386 },
387};
388
381#if CONFIG_BLEND_FILTER389#if CONFIG_BLEND_FILTER
382 390
383static int activate(AVFilterContext *ctx)391static int activate(AVFilterContext *ctx)
@@ -396,14 +404,6 @@ static const AVFilterPad blend_inputs[] = { · 12 unmodified lines
396 },404 },
397};405};
398 406
399static const AVFilterPad blend_outputs[] = {
400 {
401 .name = "default",
402 .type = AVMEDIA_TYPE_VIDEO,
403 .config_props = config_output,
404 },
405};
406
407const AVFilter ff_vf_blend = {407const AVFilter ff_vf_blend = {
408 .name = "blend",408 .name = "blend",
409 .description = NULL_IF_CONFIG_SMALL("Blend two video frames into each other."),409 .description = NULL_IF_CONFIG_SMALL("Blend two video frames into each other."),
@@ -455,14 +455,6 @@ static const AVFilterPad tblend_inputs[] = { · 45 unmodified lines
455 },455 },
456};456};
457 457
458static const AVFilterPad tblend_outputs[] = {
459 {
460 .name = "default",
461 .type = AVMEDIA_TYPE_VIDEO,
462 .config_props = config_output,
463 },
464};
465
466const AVFilter ff_vf_tblend = {458const AVFilter ff_vf_tblend = {
467 .name = "tblend",459 .name = "tblend",
468 .description = NULL_IF_CONFIG_SMALL("Blend successive frames."),460 .description = NULL_IF_CONFIG_SMALL("Blend successive frames."),
@@ -471,7 +463,7 @@ const AVFilter ff_vf_tblend = { · 2 unmodified lines
471 .init = init,463 .init = init,
472 .uninit = uninit,464 .uninit = uninit,
473 FILTER_INPUTS(tblend_inputs),465 FILTER_INPUTS(tblend_inputs),
474 FILTER_OUTPUTS(tblend_outputs),466 FILTER_OUTPUTS(blend_outputs),
475 FILTER_PIXFMTS_ARRAY(pix_fmts),467 FILTER_PIXFMTS_ARRAY(pix_fmts),
476 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS,468 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS,
477 .process_command = process_command,469 .process_command = process_command,

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