Unified · Split
| @@ -56,15 +56,6 @@ static const AVOption grayworld_options[] = { · 55 unmodified lines | |||
| 56 | 56 | ||
| 57 | AVFILTER_DEFINE_CLASS(grayworld); | 57 | AVFILTER_DEFINE_CLASS(grayworld); |
| 58 | 58 | ||
| 59 | static int query_formats(AVFilterContext *ctx) | ||
| 60 | { | ||
| 61 | static const enum AVPixelFormat pix_fmts[] = { | ||
| 62 | AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32, | ||
| 63 | AV_PIX_FMT_NONE, | ||
| 64 | }; | ||
| 65 | return ff_set_common_formats_from_list(ctx, pix_fmts); | ||
| 66 | } | ||
| 67 | |||
| 68 | static void apply_matrix(const float matrix[3][3], const float input[3], float output[3]) | 59 | static void apply_matrix(const float matrix[3][3], const float input[3], float output[3]) |
| 69 | { | 60 | { |
| 70 | output[0] = matrix[0][0] * input[0] + matrix[0][1] * input[1] + matrix[0][2] * input[2]; | 61 | output[0] = matrix[0][0] * input[0] + matrix[0][1] * input[1] + matrix[0][2] * input[2]; |
| @@ -331,7 +322,7 @@ const AVFilter ff_vf_grayworld = { · 260 unmodified lines | |||
| 331 | .priv_class = &grayworld_class, | 322 | .priv_class = &grayworld_class, |
| 332 | FILTER_INPUTS(grayworld_inputs), | 323 | FILTER_INPUTS(grayworld_inputs), |
| 333 | FILTER_OUTPUTS(grayworld_outputs), | 324 | FILTER_OUTPUTS(grayworld_outputs), |
| 334 | FILTER_QUERY_FUNC(query_formats), | 325 | FILTER_PIXFMTS(AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32), |
| 335 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, | 326 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, |
| 336 | .uninit = uninit, | 327 | .uninit = uninit, |
| 337 | }; | 328 | }; |