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

avfilter/avfiltergraph: fix check for negative return

Browse Source 
Before this commit if allocation would fail in ff_add_channel_layout()
function, function would return negative error code and this would
cause wrong format pick up later. If allocation would not fail return
code would be 0 and then format negotiation would simply fail as code
would break from the loop but with wrong return code.

Error was introduced in 6aaac24d72a7da commit.

Fixes #6638
This commit is contained in:
Paul B Mahol 2023-05-12 21:01:41 +02:00
parent 8564b4ab05
commit ee6ef66d65
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/avfiltergraph.c
View File

@ -748,8 +748,10 @@ static int reduce_formats_on_filter(AVFilterContext *filter)
(KNOWN(fmt) || fmts->all_counts)) {
/* Turn the infinite list into a singleton */
fmts->all_layouts = fmts->all_counts = 0;
if (ff_add_channel_layout(&outlink->incfg.channel_layouts, fmt) < 0)
ret = 1;
ret = ff_add_channel_layout(&outlink->incfg.channel_layouts, fmt);
if (ret < 0)
return ret;
ret = 1;
break;
}