diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-08-10 01:25:31 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-08-13 17:36:22 +0200 |
| commit | 18ec426a861c1a9a2072080796dff146bafecb53 (patch) | |
| tree | d3d8b683db1ff9b6a46fd6e828e0f4c7c94ed1be /libavfilter/vf_edgedetect.c | |
| parent | 55d9d6767967794edcdd6e1bbd8840fc6f4e9315 (diff) | |
| download | ffmpeg-18ec426a861c1a9a2072080796dff146bafecb53.tar.gz | |
avfilter/formats: Factor common function combinations out
Several combinations of functions happen quite often in query_format
functions; e.g. ff_set_common_formats(ctx, ff_make_format_list(sample_fmts))
is very common. This commit therefore adds functions that are equivalent
to commonly used function combinations in order to reduce code
duplication.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavfilter/vf_edgedetect.c')
| -rw-r--r-- | libavfilter/vf_edgedetect.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavfilter/vf_edgedetect.c b/libavfilter/vf_edgedetect.c index e21d341fd2..e6111b4a27 100644 --- a/libavfilter/vf_edgedetect.c +++ b/libavfilter/vf_edgedetect.c @@ -101,7 +101,6 @@ static int query_formats(AVFilterContext *ctx) static const enum AVPixelFormat wires_pix_fmts[] = {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}; static const enum AVPixelFormat canny_pix_fmts[] = {AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_GBRP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}; static const enum AVPixelFormat colormix_pix_fmts[] = {AV_PIX_FMT_GBRP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}; - AVFilterFormats *fmts_list; const enum AVPixelFormat *pix_fmts = NULL; if (edgedetect->mode == MODE_WIRES) { @@ -113,10 +112,7 @@ static int query_formats(AVFilterContext *ctx) } else { av_assert0(0); } - fmts_list = ff_make_format_list(pix_fmts); - if (!fmts_list) - return AVERROR(ENOMEM); - return ff_set_common_formats(ctx, fmts_list); + return ff_set_common_formats_from_list(ctx, pix_fmts); } static int config_props(AVFilterLink *inlink) |