diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-09-26 00:09:16 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-09-26 12:41:33 +0200 |
| commit | 99feb59cf7ea9d6753502d76110ced96f128dac6 (patch) | |
| tree | e0f823719df3fbb9db44e7c421bf84d894210320 /libavfilter/vf_mix.c | |
| parent | aff855148a098c70c0a55c58aeb1205d839ed516 (diff) | |
| download | ffmpeg-99feb59cf7ea9d6753502d76110ced96f128dac6.tar.gz | |
avfilter/formats: Make ff_formats_pixdesc_filter return AVFilterFormats*
Up until now, it has returned the AVFilterFormats list via
an AVFilterFormats** parameter; the actual return value was an int
that was always AVERROR(ENOMEM) on error. The AVFilterFormats**
argument was a pure output parameter which was only documented
by naming the parameter rfmts. Yet nevertheless all callers
initialized the underlying AVFilterFormats* to NULL.
This commit changes this to return a pointer to AVFilterFormats
directly. This is more in line with the API in general, as it
allows to avoid checks for intermediate values.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavfilter/vf_mix.c')
| -rw-r--r-- | libavfilter/vf_mix.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index ce66202557..13032e466a 100644 --- a/libavfilter/vf_mix.c +++ b/libavfilter/vf_mix.c @@ -55,16 +55,11 @@ typedef struct MixContext { static int query_formats(AVFilterContext *ctx) { - AVFilterFormats *formats = NULL; - int ret; + int reject_flags = AV_PIX_FMT_FLAG_BITSTREAM | + AV_PIX_FMT_FLAG_HWACCEL | + AV_PIX_FMT_FLAG_PAL; - ret = ff_formats_pixdesc_filter(&formats, 0, - AV_PIX_FMT_FLAG_BITSTREAM | - AV_PIX_FMT_FLAG_PAL | - AV_PIX_FMT_FLAG_HWACCEL); - if (ret < 0) - return ret; - return ff_set_common_formats(ctx, formats); + return ff_set_common_formats(ctx, ff_formats_pixdesc_filter(0, reject_flags)); } static int parse_weights(AVFilterContext *ctx) |