Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -78,8 +78,6 @@ static const AVOption convolve_options[] = { · 77 unmodified lines | |||
| 78 | { NULL }, | 78 | { NULL }, |
| 79 | }; | 79 | }; |
| 80 | 80 | ||
| 81 | static int query_formats(AVFilterContext *ctx) | ||
| 82 | { | ||
| 83 | static const enum AVPixelFormat pixel_fmts_fftfilt[] = { | 81 | static const enum AVPixelFormat pixel_fmts_fftfilt[] = { |
| 84 | AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, | 82 | AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, |
| 85 | AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, | 83 | AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, |
| @@ -101,9 +99,6 @@ static int query_formats(AVFilterContext *ctx) · 15 unmodified lines | |||
| 101 | AV_PIX_FMT_NONE | 99 | AV_PIX_FMT_NONE |
| 102 | }; | 100 | }; |
| 103 | 101 | ||
| 104 | return ff_set_common_formats_from_list(ctx, pixel_fmts_fftfilt); | ||
| 105 | } | ||
| 106 | |||
| 107 | static int config_input_main(AVFilterLink *inlink) | 102 | static int config_input_main(AVFilterLink *inlink) |
| 108 | { | 103 | { |
| 109 | ConvolveContext *s = inlink->dst->priv; | 104 | ConvolveContext *s = inlink->dst->priv; |
| @@ -668,7 +663,7 @@ const AVFilter ff_vf_convolve = { · 558 unmodified lines | |||
| 668 | .priv_class = &convolve_class, | 663 | .priv_class = &convolve_class, |
| 669 | FILTER_INPUTS(convolve_inputs), | 664 | FILTER_INPUTS(convolve_inputs), |
| 670 | FILTER_OUTPUTS(convolve_outputs), | 665 | FILTER_OUTPUTS(convolve_outputs), |
| 671 | FILTER_QUERY_FUNC(query_formats), | 666 | FILTER_PIXFMTS_ARRAY(pixel_fmts_fftfilt), |
| 672 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, | 667 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, |
| 673 | }; | 668 | }; |
| 674 | 669 | ||
| @@ -698,7 +693,7 @@ const AVFilter ff_vf_deconvolve = { · 23 unmodified lines | |||
| 698 | .priv_class = &deconvolve_class, | 693 | .priv_class = &deconvolve_class, |
| 699 | FILTER_INPUTS(convolve_inputs), | 694 | FILTER_INPUTS(convolve_inputs), |
| 700 | FILTER_OUTPUTS(convolve_outputs), | 695 | FILTER_OUTPUTS(convolve_outputs), |
| 701 | FILTER_QUERY_FUNC(query_formats), | 696 | FILTER_PIXFMTS_ARRAY(pixel_fmts_fftfilt), |
| 702 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, | 697 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, |
| 703 | }; | 698 | }; |
| 704 | 699 | ||