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

avfilter/vf_format: allow empty pix_fmts list

Browse Source 
Which will impose no restriction. This makes sense when using e.g.
`color_ranges=pc` to limit the color range, without also limiting the
pixel format.
This commit is contained in:
Niklas Haas 2023-10-25 13:43:28 +02:00
parent 796669d483
commit 44a33fccd8
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavfilter/vf_format.c
View File

@ -91,11 +91,6 @@ static av_cold int init(AVFilterContext *ctx)
enum AVPixelFormat pix_fmt; enum AVPixelFormat pix_fmt;
int ret; int ret;
if (!s->pix_fmts) {
av_log(ctx, AV_LOG_ERROR, "Empty output format string.\n");
return AVERROR(EINVAL);
}
for (char *sep, *cur = s->pix_fmts; cur; cur = sep) { for (char *sep, *cur = s->pix_fmts; cur; cur = sep) {
sep = strchr(cur, '|'); sep = strchr(cur, '|');
if (sep && *sep) if (sep && *sep)
@ -131,7 +126,7 @@ static av_cold int init(AVFilterContext *ctx)
} }
/* hold on to a ref for the lifetime of the filter */ /* hold on to a ref for the lifetime of the filter */
if ((ret = ff_formats_ref(s->formats, &s->formats)) < 0 || if (s->formats && (ret = ff_formats_ref(s->formats, &s->formats)) < 0 ||
s->color_spaces && (ret = ff_formats_ref(s->color_spaces, &s->color_spaces)) < 0 || s->color_spaces && (ret = ff_formats_ref(s->color_spaces, &s->color_spaces)) < 0 ||
s->color_ranges && (ret = ff_formats_ref(s->color_ranges, &s->color_ranges)) < 0) s->color_ranges && (ret = ff_formats_ref(s->color_ranges, &s->color_ranges)) < 0)
return ret; return ret;
@ -144,7 +139,7 @@ static int query_formats(AVFilterContext *ctx)
FormatContext *s = ctx->priv; FormatContext *s = ctx->priv;
int ret; int ret;
if ((ret = ff_set_common_formats(ctx, s->formats)) < 0 || if (s->formats && (ret = ff_set_common_formats(ctx, s->formats)) < 0 ||
s->color_spaces && (ret = ff_set_common_color_spaces(ctx, s->color_spaces)) < 0 || s->color_spaces && (ret = ff_set_common_color_spaces(ctx, s->color_spaces)) < 0 ||
s->color_ranges && (ret = ff_set_common_color_ranges(ctx, s->color_ranges)) < 0) s->color_ranges && (ret = ff_set_common_color_ranges(ctx, s->color_ranges)) < 0)
return ret; return ret;