History

avfilter/vf_dnn_classify: Use formats list instead of query function

Andreas Rheinhardt committed 5 years ago

Commit 2af3b6d1 parent 2bcbe921 file · +1 −5Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/vf_dnn_classify.c+1−5
@@ -197,8 +197,6 @@ static av_cold int dnn_classify_init(AVFilterContext *context) · 196 unmodified lines
197 return 0;197 return 0;
198}198}
199 199
200static int dnn_classify_query_formats(AVFilterContext *context)
201{
202 static const enum AVPixelFormat pix_fmts[] = {200 static const enum AVPixelFormat pix_fmts[] = {
203 AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,201 AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,
204 AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAYF32,202 AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAYF32,
@@ -207,8 +205,6 @@ static int dnn_classify_query_formats(AVFilterContext *context) · 2 unmodified lines
207 AV_PIX_FMT_NV12,205 AV_PIX_FMT_NV12,
208 AV_PIX_FMT_NONE206 AV_PIX_FMT_NONE
209 };207 };
210 return ff_set_common_formats_from_list(context, pix_fmts);
211}
212 208
213static int dnn_classify_flush_frame(AVFilterLink *outlink, int64_t pts, int64_t *out_pts)209static int dnn_classify_flush_frame(AVFilterLink *outlink, int64_t pts, int64_t *out_pts)
214{210{
@@ -323,7 +319,7 @@ const AVFilter ff_vf_dnn_classify = { · 108 unmodified lines
323 .uninit = dnn_classify_uninit,319 .uninit = dnn_classify_uninit,
324 FILTER_INPUTS(dnn_classify_inputs),320 FILTER_INPUTS(dnn_classify_inputs),
325 FILTER_OUTPUTS(dnn_classify_outputs),321 FILTER_OUTPUTS(dnn_classify_outputs),
326 FILTER_QUERY_FUNC(dnn_classify_query_formats),322 FILTER_PIXFMTS_ARRAY(pix_fmts),
327 .priv_class = &dnn_classify_class,323 .priv_class = &dnn_classify_class,
328 .activate = dnn_classify_activate,324 .activate = dnn_classify_activate,
329};325};

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t