Unified · Split
| @@ -350,8 +350,6 @@ static av_cold void decimate_uninit(AVFilterContext *ctx) · 349 unmodified lines | |||
| 350 | av_freep(&dm->clean_src); | 350 | av_freep(&dm->clean_src); |
| 351 | } | 351 | } |
| 352 | 352 | ||
| 353 | static int query_formats(AVFilterContext *ctx) | ||
| 354 | { | ||
| 355 | static const enum AVPixelFormat pix_fmts[] = { | 353 | static const enum AVPixelFormat pix_fmts[] = { |
| 356 | #define PF_NOALPHA(suf) AV_PIX_FMT_YUV420##suf, AV_PIX_FMT_YUV422##suf, AV_PIX_FMT_YUV444##suf | 354 | #define PF_NOALPHA(suf) AV_PIX_FMT_YUV420##suf, AV_PIX_FMT_YUV422##suf, AV_PIX_FMT_YUV444##suf |
| 357 | #define PF_ALPHA(suf) AV_PIX_FMT_YUVA420##suf, AV_PIX_FMT_YUVA422##suf, AV_PIX_FMT_YUVA444##suf | 355 | #define PF_ALPHA(suf) AV_PIX_FMT_YUVA420##suf, AV_PIX_FMT_YUVA422##suf, AV_PIX_FMT_YUVA444##suf |
| @@ -365,8 +363,6 @@ static int query_formats(AVFilterContext *ctx) · 7 unmodified lines | |||
| 365 | AV_PIX_FMT_GRAY16, | 363 | AV_PIX_FMT_GRAY16, |
| 366 | AV_PIX_FMT_NONE | 364 | AV_PIX_FMT_NONE |
| 367 | }; | 365 | }; |
| 368 | return ff_set_common_formats_from_list(ctx, pix_fmts); | ||
| 369 | } | ||
| 370 | 366 | ||
| 371 | static int config_output(AVFilterLink *outlink) | 367 | static int config_output(AVFilterLink *outlink) |
| 372 | { | 368 | { |
| @@ -438,7 +434,7 @@ const AVFilter ff_vf_decimate = { · 65 unmodified lines | |||
| 438 | .uninit = decimate_uninit, | 434 | .uninit = decimate_uninit, |
| 439 | .priv_size = sizeof(DecimateContext), | 435 | .priv_size = sizeof(DecimateContext), |
| 440 | FILTER_OUTPUTS(decimate_outputs), | 436 | FILTER_OUTPUTS(decimate_outputs), |
| 441 | FILTER_QUERY_FUNC(query_formats), | 437 | FILTER_PIXFMTS_ARRAY(pix_fmts), |
| 442 | .priv_class = &decimate_class, | 438 | .priv_class = &decimate_class, |
| 443 | .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, | 439 | .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, |
| 444 | }; | 440 | }; |