virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity

avfilter/vf_dnn_detect: Use formats list instead of query function

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-09-27 22:57:58 +02:00
parent 16b3be4989
commit 2bcbe923aa
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/vf_dnn_detect.c
View File

@ -340,8 +340,6 @@ static av_cold int dnn_detect_init(AVFilterContext *context)
return 0; return 0;
} }
static int dnn_detect_query_formats(AVFilterContext *context)
{
static const enum AVPixelFormat pix_fmts[] = { static const enum AVPixelFormat pix_fmts[] = {
AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,
AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAYF32, AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAYF32,
@ -350,8 +348,6 @@ static int dnn_detect_query_formats(AVFilterContext *context)
AV_PIX_FMT_NV12, AV_PIX_FMT_NV12,
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}; };
return ff_set_common_formats_from_list(context, pix_fmts);
}
static int dnn_detect_flush_frame(AVFilterLink *outlink, int64_t pts, int64_t *out_pts) static int dnn_detect_flush_frame(AVFilterLink *outlink, int64_t pts, int64_t *out_pts)
{ {
@ -466,7 +462,7 @@ const AVFilter ff_vf_dnn_detect = {
.uninit = dnn_detect_uninit, .uninit = dnn_detect_uninit,
FILTER_INPUTS(dnn_detect_inputs), FILTER_INPUTS(dnn_detect_inputs),
FILTER_OUTPUTS(dnn_detect_outputs), FILTER_OUTPUTS(dnn_detect_outputs),
FILTER_QUERY_FUNC(dnn_detect_query_formats), FILTER_PIXFMTS_ARRAY(pix_fmts),
.priv_class = &dnn_detect_class, .priv_class = &dnn_detect_class,
.activate = dnn_detect_activate, .activate = dnn_detect_activate,
}; };