mirrors/librempeg
1
0
Fork 0
mirror of https://github.com/librempeg/librempeg synced 2024-11-22 00:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

avfilter/af_amerge: do not try to put partial formats

Browse Source 
Fixes crash.
This commit is contained in:
Paul B Mahol 2024-11-10 16:53:01 +00:00
parent f6d93a1f08
commit 677f628d7f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/af_amerge.c
View File

@ -73,6 +73,12 @@ static int query_formats(const AVFilterContext *ctx,
AVFilterChannelLayouts *layouts;
int ret, nb_ch = 0;
for (int i = 0; i < s->nb_inputs; i++) {
if (!ctx->inputs[i]->incfg.channel_layouts ||
ctx->inputs[i]->incfg.channel_layouts->nb_channel_layouts < 1)
return AVERROR(EAGAIN);
}
if ((ret = ff_set_common_all_samplerates2(ctx, cfg_in, cfg_out)) < 0)
return ret;
@ -82,10 +88,6 @@ static int query_formats(const AVFilterContext *ctx,
for (int i = 0; i < s->nb_inputs; i++) {
AVChannelLayout *in_layout;
if (!ctx->inputs[i]->incfg.channel_layouts ||
ctx->inputs[i]->incfg.channel_layouts->nb_channel_layouts < 1)
return AVERROR(EAGAIN);
layouts = NULL;
in_layout = &ctx->inputs[i]->incfg.channel_layouts->channel_layouts[0];
nb_ch += in_layout->nb_channels;