highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_scale: fix input declaration

Browse Source 
This filter needs to be marked as having only one input by default, with
AVFILTER_FLAG_DYNAMIC_INPUTS allowing the extra input to be added at
init() time.

Fixes: bb80445813
This commit is contained in:
Niklas Haas
2024-05-03 22:07:30 +02:00
parent 38f67a32b3
commit 6a5b021e35
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavfilter/vf_scale.c
View File

@ -442,8 +442,15 @@ static av_cold int init(AVFilterContext *ctx)
if (!threads) if (!threads)
av_opt_set_int(scale->sws_opts, "threads", ff_filter_get_nb_threads(ctx), 0); av_opt_set_int(scale->sws_opts, "threads", ff_filter_get_nb_threads(ctx), 0);
if (ctx->filter != &ff_vf_scale2ref) if (ctx->filter != &ff_vf_scale2ref && scale->uses_ref) {
ctx->nb_inputs = scale->uses_ref ? 2 : 1; AVFilterPad pad = {
.name = "ref",
.type = AVMEDIA_TYPE_VIDEO,
};
ret = ff_append_inpad(ctx, &pad);
if (ret < 0)
return ret;
}
return 0; return 0;
} }
@ -1234,9 +1241,6 @@ static const AVFilterPad avfilter_vf_scale_inputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
}, {
.name = "ref",
.type = AVMEDIA_TYPE_VIDEO,
}, },
}; };
@ -1261,6 +1265,7 @@ const AVFilter ff_vf_scale = {
FILTER_QUERY_FUNC(query_formats), FILTER_QUERY_FUNC(query_formats),
.activate = activate, .activate = activate,
.process_command = process_command, .process_command = process_command,
.flags = AVFILTER_FLAG_DYNAMIC_INPUTS,
}; };
static const AVFilterPad avfilter_vf_scale2ref_inputs[] = { static const AVFilterPad avfilter_vf_scale2ref_inputs[] = {