har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/tests/filtfmts: Check for existence of formats/channel layouts

Browse Source 
Fixes segfaults with filters that either return AVERROR(EAGAIN)
(or another error) or that do not set everything and rely on
filter_query_formats() to set the rest.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-10-05 22:18:36 +02:00
parent a228baeee1
commit 9a1547ba1e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/tests/filtfmts.c
View File

@ -43,7 +43,7 @@ static void print_formats_internal(AVFilterLink **links, const AVFilterPad *pads
if (link->type == AVMEDIA_TYPE_VIDEO) { if (link->type == AVMEDIA_TYPE_VIDEO) {
const AVFilterFormats *const fmts = cfg->formats; const AVFilterFormats *const fmts = cfg->formats;
for (unsigned j = 0; j < fmts->nb_formats; j++) { for (unsigned j = 0; fmts && j < fmts->nb_formats; j++) {
printf("%s[%u] %s: fmt:%s\n", printf("%s[%u] %s: fmt:%s\n",
inout_string, i, pad_name, inout_string, i, pad_name,
av_get_pix_fmt_name(fmts->formats[j])); av_get_pix_fmt_name(fmts->formats[j]));
@ -52,12 +52,12 @@ static void print_formats_internal(AVFilterLink **links, const AVFilterPad *pads
const AVFilterFormats *const fmts = cfg->formats; const AVFilterFormats *const fmts = cfg->formats;
const AVFilterChannelLayouts *const layouts = cfg->channel_layouts; const AVFilterChannelLayouts *const layouts = cfg->channel_layouts;
for (unsigned j = 0; j < fmts->nb_formats; j++) for (unsigned j = 0; fmts && j < fmts->nb_formats; j++)
printf("%s[%u] %s: fmt:%s\n", printf("%s[%u] %s: fmt:%s\n",
inout_string, i, pad_name, inout_string, i, pad_name,
av_get_sample_fmt_name(fmts->formats[j])); av_get_sample_fmt_name(fmts->formats[j]));
for (unsigned j = 0; j < layouts->nb_channel_layouts; j++) { for (unsigned j = 0; layouts && j < layouts->nb_channel_layouts; j++) {
char buf[256]; char buf[256];
av_get_channel_layout_string(buf, sizeof(buf), -1, av_get_channel_layout_string(buf, sizeof(buf), -1,
layouts->channel_layouts[j]); layouts->channel_layouts[j]);