Unified · Split
| @@ -90,8 +90,6 @@ static const AVOption colorchannelmixer_options[] = { · 89 unmodified lines | |||
| 90 | 90 | ||
| 91 | AVFILTER_DEFINE_CLASS(colorchannelmixer); | 91 | AVFILTER_DEFINE_CLASS(colorchannelmixer); |
| 92 | 92 | ||
| 93 | static int query_formats(AVFilterContext *ctx) | ||
| 94 | { | ||
| 95 | static const enum AVPixelFormat pix_fmts[] = { | 93 | static const enum AVPixelFormat pix_fmts[] = { |
| 96 | AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, | 94 | AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, |
| 97 | AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, | 95 | AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, |
| @@ -109,9 +107,6 @@ static int query_formats(AVFilterContext *ctx) · 11 unmodified lines | |||
| 109 | AV_PIX_FMT_NONE | 107 | AV_PIX_FMT_NONE |
| 110 | }; | 108 | }; |
| 111 | 109 | ||
| 112 | return ff_set_common_formats_from_list(ctx, pix_fmts); | ||
| 113 | } | ||
| 114 | |||
| 115 | static float lerpf(float v0, float v1, float f) | 110 | static float lerpf(float v0, float v1, float f) |
| 116 | { | 111 | { |
| 117 | return v0 + (v1 - v0) * f; | 112 | return v0 + (v1 - v0) * f; |
| @@ -782,7 +777,7 @@ const AVFilter ff_vf_colorchannelmixer = { · 664 unmodified lines | |||
| 782 | .uninit = uninit, | 777 | .uninit = uninit, |
| 783 | FILTER_INPUTS(colorchannelmixer_inputs), | 778 | FILTER_INPUTS(colorchannelmixer_inputs), |
| 784 | FILTER_OUTPUTS(colorchannelmixer_outputs), | 779 | FILTER_OUTPUTS(colorchannelmixer_outputs), |
| 785 | FILTER_QUERY_FUNC(query_formats), | 780 | FILTER_PIXFMTS_ARRAY(pix_fmts), |
| 786 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, | 781 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, |
| 787 | .process_command = process_command, | 782 | .process_command = process_command, |
| 788 | }; | 783 | }; |