Unified · Split
| @@ -469,8 +469,6 @@ static AVFrame *do_vif(AVFilterContext *ctx, AVFrame *main, const AVFrame *ref) · 468 unmodified lines | |||
| 469 | return main; | 469 | return main; |
| 470 | } | 470 | } |
| 471 | 471 | ||
| 472 | static int query_formats(AVFilterContext *ctx) | ||
| 473 | { | ||
| 474 | static const enum AVPixelFormat pix_fmts[] = { | 472 | static const enum AVPixelFormat pix_fmts[] = { |
| 475 | AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, | 473 | AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, |
| 476 | AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16, | 474 | AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16, |
| @@ -483,9 +481,6 @@ static int query_formats(AVFilterContext *ctx) · 6 unmodified lines | |||
| 483 | AV_PIX_FMT_NONE | 481 | AV_PIX_FMT_NONE |
| 484 | }; | 482 | }; |
| 485 | 483 | ||
| 486 | return ff_set_common_formats_from_list(ctx, pix_fmts); | ||
| 487 | } | ||
| 488 | |||
| 489 | static int config_input_ref(AVFilterLink *inlink) | 484 | static int config_input_ref(AVFilterLink *inlink) |
| 490 | { | 485 | { |
| 491 | AVFilterContext *ctx = inlink->dst; | 486 | AVFilterContext *ctx = inlink->dst; |
| @@ -642,6 +637,6 @@ const AVFilter ff_vf_vif = { · 150 unmodified lines | |||
| 642 | .activate = activate, | 637 | .activate = activate, |
| 643 | FILTER_INPUTS(vif_inputs), | 638 | FILTER_INPUTS(vif_inputs), |
| 644 | FILTER_OUTPUTS(vif_outputs), | 639 | FILTER_OUTPUTS(vif_outputs), |
| 645 | FILTER_QUERY_FUNC(query_formats), | 640 | FILTER_PIXFMTS_ARRAY(pix_fmts), |
| 646 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, | 641 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, |
| 647 | }; | 642 | }; |